diff options
| author | friendica <info@friendica.com> | 2014-12-01 18:53:49 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-01 18:53:49 -0800 |
| commit | f3b92c0ef228a25c6d6734d60a23251506317b3f (patch) | |
| tree | f20fa34ea54008af6b6ea39cf9e6800ee3aec3e8 /view/theme | |
| parent | 0b84ba1eab8a583f7cf89f44f37b78e9cac72e1b (diff) | |
| parent | 460d379e7efc074808109b4c9acd0aea46460d16 (diff) | |
| download | volse-hubzilla-f3b92c0ef228a25c6d6734d60a23251506317b3f.tar.gz volse-hubzilla-f3b92c0ef228a25c6d6734d60a23251506317b3f.tar.bz2 volse-hubzilla-f3b92c0ef228a25c6d6734d60a23251506317b3f.zip | |
Merge https://github.com/friendica/red into pending_merge
Conflicts:
version.inc
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index eb3f67453..d32514dbf 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1405,7 +1405,7 @@ div.jGrowl div.jGrowl-notification { #nav-search-text-ac .autocomplete { position: fixed; - top: 51px; + top: 50px; border: 1px solid $nav_bd; border-top: none; } @@ -2058,21 +2058,11 @@ img.mail-list-sender-photo { /* nav bootstrap */ -nav i { - font-size: 14px; -} nav img { - height: 47px; - width: 47px; - margin-top: 2px; border-radius: $radiuspx; } -nav ul li { - max-height: 50px -} - nav .dropdown-menu { font-size: $body_font_size; border-top-right-radius: 0px; @@ -2395,4 +2385,4 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { .bb_observer img { border: 3px solid red !important; -}
\ No newline at end of file +} diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 55b35af4b..50ec9613b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -108,7 +108,7 @@ if(! $a->install) { if (! $navtabs_bgchover) $navtabs_bgchover = "rgba(238,238,238,0.8)"; if (! $link_colour) - $link_colour = "#428BCA"; + $link_colour = "#337AB7"; if (! $navaside_bghover) $navaside_bghover = "#eee"; if (! $link_font_weight) |