diff options
Diffstat (limited to 'view/theme')
-rw-r--r-- | view/theme/redbasic/css/style.css | 29 | ||||
-rw-r--r-- | view/theme/redbasic/js/redbasic.js | 4 |
2 files changed, 17 insertions, 16 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f5da8a222..02ee689ce 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1188,6 +1188,16 @@ margin-right: 50px; color: $toolicon_colour; } +.generic-icons-nav { + font-size: 1.2em; + margin-right: 7px; +} + +nav .navbar-collapse.in .generic-icons, +nav .navbar-collapse.collapsing .generic-icons { + color: $nav_active_icon_colour; +} + .admin-icons { font-size: 1.2em; color: $toolicon_colour; @@ -1524,7 +1534,6 @@ img.mail-conv-sender-photo { /* nav bootstrap */ - nav img { border-radius: $radiuspx; } @@ -1747,22 +1756,11 @@ blockquote { border-radius: $radiuspx; } -nav .badge:hover { - background-color: #999; -} - nav .badge.home-update, nav .badge.notify-update, nav .badge.intro-update, nav .badge.mail-update { - background-color:#C9302C; -} - -nav .badge.home-update:hover, -nav .badge.notify-update:hover, -nav .badge.intro-update:hover, -nav .badge.mail-update:hover { - background-color:#D9534F; + background-color: #C9302C; } .dropdown-menu { @@ -1830,7 +1828,8 @@ nav .badge.mail-update:hover { #expand-aside, #expand-tabs, #doco-return-to-top-btn, -#context-help-btn { +#context-help-btn, +#notifications-btn { color: $nav_active_icon_colour; padding: 7px 10px; } @@ -2103,6 +2102,8 @@ dl.bb-dl > dd > li { .app-icon { font-size: 80px; + color: $toolicon_colour; + text-shadow: 3px 3px 3px lightgrey; text-align: center; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 5410999b4..81a95c68b 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -53,8 +53,8 @@ $(document).ready(function() { }); $('.usermenu-head').click(function() { - if($('#navbar-collapse-1').hasClass('in')){ - $('#navbar-collapse-1').removeClass('in'); + if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('in')){ + $('#navbar-collapse-1, #navbar-collapse-2').removeClass('in'); } }); |