diff options
author | sirius <sirius83@gmx.de> | 2014-04-16 00:40:01 +0200 |
---|---|---|
committer | sirius <sirius83@gmx.de> | 2014-04-16 00:40:01 +0200 |
commit | b0dc9f13edcbb705e1aa7d0af33bf0351f4d81f4 (patch) | |
tree | 32b053e3f2c95740e316e898d6a2e15688aa4d02 /view/theme/redbasic | |
parent | 8b8feea12f886a22f7eb66456be7828b7aef455e (diff) | |
parent | efe80bb8e98b32b95d1380633e9ffd834fa82511 (diff) | |
download | volse-hubzilla-b0dc9f13edcbb705e1aa7d0af33bf0351f4d81f4.tar.gz volse-hubzilla-b0dc9f13edcbb705e1aa7d0af33bf0351f4d81f4.tar.bz2 volse-hubzilla-b0dc9f13edcbb705e1aa7d0af33bf0351f4d81f4.zip |
Merging in conflict
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r-- | view/theme/redbasic/css/style.css | 29 | ||||
-rw-r--r-- | view/theme/redbasic/schema/BS-Default.php | 2 |
2 files changed, 15 insertions, 16 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index edee90fe6..f1bfbd711 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -285,13 +285,16 @@ footer { #login-extra-links { clear: both; + width: 300px; } -#register-link, -#lost-password-link { +#register-link { float: left; margin-left: 100px; } +#lost-password-link { + float: right; +} #login-standard-end { clear: both; @@ -694,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; @@ -828,15 +831,17 @@ footer { .location-label, .gender-label, .marital-label, .homepage-label { float: left; - text-align: right; display: block; - width: 65px; + width: 70px; + } .adr, .x-gender, .marital-text, .homepage-url { float: left; display: block; - margin-left: 8px; + width: 130px; + height: 18px; + overflow: hidden; } .profile-clear { @@ -1496,7 +1501,7 @@ div.jGrowl div.jGrowl-notification { } a.rconnect { - color: #ffffff; + color: $nav_active_icon_colour; text-decoration: none; outline: none; } @@ -2234,18 +2239,10 @@ blockquote { margin-left: 24px; } - .wall-item-info { - margin-right: 10px; - } - .hide-comments-outer { margin-left: 24px; } - .comment-edit-photo { - margin: 10px; - } - .wall-item-photo { width: 48px !important; height: 48px !important; 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"; |