diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-12 14:38:26 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-12 14:38:26 -0700 |
| commit | 67c2b309d1f9bfaaf6c77b9a3d1eb214ce3894c7 (patch) | |
| tree | 36cb767c1dac750765ed90f94ac7eec6ca35c68f /view | |
| parent | df0fa9883cad7c907cce5ece1baeacb61bddc15e (diff) | |
| parent | 9821a3954908cc4eb701ace8d002b052027c0311 (diff) | |
| download | volse-hubzilla-67c2b309d1f9bfaaf6c77b9a3d1eb214ce3894c7.tar.gz volse-hubzilla-67c2b309d1f9bfaaf6c77b9a3d1eb214ce3894c7.tar.bz2 volse-hubzilla-67c2b309d1f9bfaaf6c77b9a3d1eb214ce3894c7.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/default.css | 7 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 36 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 |
3 files changed, 18 insertions, 27 deletions
diff --git a/view/css/default.css b/view/css/default.css index 566877959..e84561baf 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -1,9 +1,8 @@ header #banner { position: fixed; - top: 0; - width: 250px; - margin-left: auto; - margin-right: auto; + width: 33%; + margin-left: 33%; + margin-right: 33%; } main { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c4593f01a..f75808eb7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -201,13 +201,14 @@ nav #banner #logo-text a:hover { text-decoration: none; } .nav-channel-select { margin-left: 8px; } header #banner { -/* overflow: hidden; */ - text-align: center; - font-size: 14px; - font-family: tahoma, "Lucida Sans", sans; - color: $banner_colour; - font-weight: bold; - margin-top: 14px; + z-index: 1040; + margin-top: 14px; + text-align: center; + font-size: 14px; + font-family: tahoma, "Lucida Sans", sans; + color: $banner_colour; + font-weight: bold; + whitespace: nowrap; } header #banner a, @@ -215,15 +216,17 @@ header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { - color: #FFF; - text-decoration: none; - outline: none; - vertical-align: bottom; + color: $banner_colour; + text-decoration: none; + outline: none; + vertical-align: bottom; } + header #banner #logo-img { height: 22px; margin-top: 5px; } + header #banner #logo-text { font-size: 22px; } @@ -1302,17 +1305,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { padding: 0; } -/* header */ -header { - position: fixed; - left: 43%; - right: 43%; - margin: 0px; - padding: 0px; - z-index: 1040; - color: #fff; -} - .notif-item a { color: #000; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index e90eb7918..a0da5e302 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -156,7 +156,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $aside_width = 285; - // left aside and right aside are is 231px + converse width + // left aside and right aside are 285px + converse width if($align_left) { $main_width = (($aside_width) + intval($converse_width)); } |