strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2116 from tobiasd/2110-followup

Browse source 
followup for #2110 putting the styling in less file and recompile css
This commit is contained in:
Michael Vogel 2015-11-29 12:03:25 +01:00
commit 56e7b2002d
4 changed files with 56 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
view/theme/quattro/dark/style.css
View file

@ -838,7 +838,6 @@ aside #profile-extra-links li {
margin: 0px; margin: 0px;
list-style: none; list-style: none;
} }
aside #subscribe-feed-link,
aside #wallmessage-link { aside #wallmessage-link {
display: block; display: block;
-moz-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px;
@ -851,7 +850,6 @@ aside #wallmessage-link {
padding: 4px 2px 2px 35px; padding: 4px 2px 2px 35px;
margin-top: 3px; margin-top: 3px;
} }
aside #subscribe-feed:hover,
aside #wallmessage-link:hover { aside #wallmessage-link:hover {
text-decoration: none; text-decoration: none;
background-color: #19aeff; background-color: #19aeff;
@ -871,6 +869,21 @@ aside #dfrn-request-link:hover {
text-decoration: none; text-decoration: none;
background-color: #19aeff; background-color: #19aeff;
} }
aside #subscribe-feed-link {
display: block;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
font-weight: bold;
text-transform: uppercase;
padding: 4px 2px 2px 35px;
}
aside #subscribe-feed-link:hover {
text-decoration: none;
background-color: #19aeff;
}
aside #profiles-menu { aside #profiles-menu {
width: 20em; width: 20em;
} }

17
view/theme/quattro/green/style.css
View file

@ -854,7 +854,6 @@ aside #wallmessage-link:hover {
text-decoration: none; text-decoration: none;
background-color: #ccff42; background-color: #ccff42;
} }
aside #subscribe-feed-link,
aside #dfrn-request-link { aside #dfrn-request-link {
display: block; display: block;
-moz-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px;
@ -866,11 +865,25 @@ aside #dfrn-request-link {
text-transform: uppercase; text-transform: uppercase;
padding: 4px 2px 2px 35px; padding: 4px 2px 2px 35px;
} }
aside #subscribe-feed-link:hover,
aside #dfrn-request-link:hover { aside #dfrn-request-link:hover {
text-decoration: none; text-decoration: none;
background-color: #ccff42; background-color: #ccff42;
} }
aside #subscribe-feed-link {
display: block;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
background: #009100 url('../../../images/connect-bg.png') no-repeat left center;
font-weight: bold;
text-transform: uppercase;
padding: 4px 2px 2px 35px;
}
aside #subscribe-feed-link:hover {
text-decoration: none;
background-color: #ccff42;
}
aside #profiles-menu { aside #profiles-menu {
width: 20em; width: 20em;
} }

17
view/theme/quattro/lilac/style.css
View file

@ -854,7 +854,6 @@ aside #wallmessage-link:hover {
text-decoration: none; text-decoration: none;
background-color: #86608e; background-color: #86608e;
} }
aside #subscribe-feed-link,
aside #dfrn-request-link { aside #dfrn-request-link {
display: block; display: block;
-moz-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px;
@ -866,11 +865,25 @@ aside #dfrn-request-link {
text-transform: uppercase; text-transform: uppercase;
padding: 4px 2px 2px 35px; padding: 4px 2px 2px 35px;
} }
aside #subscribe-feed-link:hover,
aside #dfrn-request-link:hover { aside #dfrn-request-link:hover {
text-decoration: none; text-decoration: none;
background-color: #86608e; background-color: #86608e;
} }
aside #subscribe-feed-link {
display: block;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
background: #521f5c url('../../../images/connect-bg.png') no-repeat left center;
font-weight: bold;
text-transform: uppercase;
padding: 4px 2px 2px 35px;
}
aside #subscribe-feed-link:hover {
text-decoration: none;
background-color: #86608e;
}
aside #profiles-menu { aside #profiles-menu {
width: 20em; width: 20em;
} }

11
view/theme/quattro/quattro.less
View file

@ -352,6 +352,17 @@ aside {
&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; } &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
} }
#subscribe-feed-link {
display: block;
.rounded();
color: @AsideConnect;
background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center;
font-weight: bold;
text-transform:uppercase;
padding: 4px 2px 2px 35px;
&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
}
#profiles-menu { width: 20em; } #profiles-menu { width: 20em; }