Merge https://github.com/friendica/red into pending_merge
This commit is contained in:
commit
dc9a06ed37
@ -697,18 +697,18 @@ footer {
|
||||
|
||||
.rconnect {
|
||||
display: block;
|
||||
color: #FFFFFF;
|
||||
color: $nav_active_icon_colour;
|
||||
margin-top: 15px;
|
||||
background-color: $nav_bg;
|
||||
-webkit-border-radius: $radiuspx ;
|
||||
-moz-border-radius: $radiuspx;
|
||||
border-radius: $radiuspx;
|
||||
border: 1px solid $nav_bd;
|
||||
padding: 5px;
|
||||
font-weight: bold;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
|
||||
#pause {
|
||||
position: fixed;
|
||||
bottom: 5px;
|
||||
@ -1501,7 +1501,7 @@ div.jGrowl div.jGrowl-notification {
|
||||
}
|
||||
|
||||
a.rconnect {
|
||||
color: #ffffff;
|
||||
color: $nav_active_icon_colour;
|
||||
text-decoration: none;
|
||||
outline: none;
|
||||
}
|
||||
|
@ -18,3 +18,5 @@
|
||||
$nav_active_icon_colour = "#555";
|
||||
if (! $radius)
|
||||
$radius = "4";
|
||||
if (! $banner_colour)
|
||||
$banner_colour = "#777";
|
||||
|
Reference in New Issue
Block a user