aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-14 16:55:57 -0700
committerfriendica <info@friendica.com>2014-04-14 16:55:57 -0700
commitdc9a06ed37b0507dd32de899684aae6f262d07ec (patch)
tree85f858bb654fa4a029fbc5f8aab9667af358ba97
parent506ae56385f5f731b7f3a8f5ee7feda2a66ae985 (diff)
parent02c08d0cdab6adee9e0514f8b5806abfba096bad (diff)
downloadvolse-hubzilla-dc9a06ed37b0507dd32de899684aae6f262d07ec.tar.gz
volse-hubzilla-dc9a06ed37b0507dd32de899684aae6f262d07ec.tar.bz2
volse-hubzilla-dc9a06ed37b0507dd32de899684aae6f262d07ec.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--view/theme/redbasic/css/style.css6
-rw-r--r--view/theme/redbasic/schema/BS-Default.php2
2 files changed, 5 insertions, 3 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 996118ad1..321baecf0 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -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;
}
diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/BS-Default.php
index f93e879e3..ce464fe2c 100644
--- a/view/theme/redbasic/schema/BS-Default.php
+++ b/view/theme/redbasic/schema/BS-Default.php
@@ -18,3 +18,5 @@
$nav_active_icon_colour = "#555";
if (! $radius)
$radius = "4";
+ if (! $banner_colour)
+ $banner_colour = "#777";