From 9df61273dba93072f6e2a844a2337c63890b0975 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 5 May 2014 21:58:58 +0200 Subject: fix some issues with nav-tabs overrides and make their background transparent --- view/theme/redbasic/css/style.css | 25 +++++++++++++++++-------- view/theme/redbasic/php/style.php | 6 +++--- 2 files changed, 20 insertions(+), 11 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d5fca0995..a8baa4877 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2253,33 +2253,42 @@ blockquote { } .nav-tabs{ - border-bottom:1px solid $navtabs_borderc !important; + border-bottom:1px solid $navtabs_borderc; } .nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{ - color: $navtabs_fontcolour !important; + color: $navtabs_fontcolour; background-color: $navtabs_bgcolour; } .nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ - border:1px solid $navtabs_borderc !important; - border-bottom:1px solid transparent !important; - bottom: -1px !important; + border:1px solid $navtabs_borderc; + border-bottom:1px solid transparent; } .nav-tabs.nav-justified > li > a { - border-bottom: none; $navtabs_linkcolour } .nav-tabs > li > a:hover, .nav-tabs > li > a:focus { text-decoration: $navtabs_decohover; background-color: $navtabs_bgchover; - border-bottom: 1px solid $navtabs_bgchover; - border-color: $navtabs_bgchover; + border-color: transparent; + border-bottom-color: $navtabs_borderc; $navtabs_linkchover } +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid $navtabs_borderc; + } + .nav-tabs.nav-justified > .active > a, + .nav-tabs.nav-justified > .active > a:hover, + .nav-tabs.nav-justified > .active > a:focus { + border-bottom-color: transparent; + } +} + .btn-default { background-color: $editbuttons_bgcolour; border-color: $editbuttons_bordercolour; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 4d892d356..698adaf4d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -94,11 +94,11 @@ if(! $a->install) { if (! $navmenu_bgimage) $navmenu_bgimage = ""; if (! $navtabs_borderc) - $navtabs_borderc = "#ddd"; + $navtabs_borderc = "rgba(204,204,204,0.8)"; if (! $navtabs_fontcolour) $navtabs_fontcolour = "#555"; if (! $navtabs_bgcolour) - $navtabs_bgcolour = "#fff"; + $navtabs_bgcolour = "rgba(254,254,254,0.4)"; if (! $navtabs_linkcolour) $navtabs_linkcolour = ""; if (! $navtabs_linkchover) @@ -106,7 +106,7 @@ if(! $a->install) { if (! $navtabs_decohover) $navtabs_decohover = "none"; if (! $navtabs_bgchover) - $navtabs_bgchover = "#eee"; + $navtabs_bgchover = "rgba(238,238,238,0.8)"; if (! $link_colour) $link_colour = "#428BCA"; if (! $banner_colour) -- cgit v1.2.3