From: Thomas Park Date: Mon, 13 Feb 2012 01:32:06 +0000 (-0500) Subject: navbar dropdown menu X-Git-Tag: v2.0.0~18 X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=18e85f4ed23c78907ee43d8704f9d0055671f320;p=bootswatch navbar dropdown menu --- diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 0962d3f..7550c21 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -3379,18 +3379,15 @@ a.thumbnail:hover { background-color: transparent; color: #4183c4; } -.navbar .nav .open.dropdown .dropdown-toggle { - color: #4183c4; +.navbar .nav > li > a:hover, .navbar .nav .open.dropdown .dropdown-toggle { + color: #4183c4 !important; } .navbar .nav .dropdown-toggle .caret { border-top-color: #333333; opacity: 1; } -.navbar .nav .open.dropdown .caret { - border-top-color: #4183c4; -} -.navbar .nav .dropdown-toggle:hover .caret { - border-top-color: #4183c4; +.navbar .nav .open.dropdown .caret, .navbar .nav .dropdown-toggle:hover .caret { + border-top-color: #4183c4 !important; } .subnav .nav > li > a { font-weight: bold; diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css index 7e6dde6..bf13ad4 100644 --- a/spacelab/bootstrap.min.css +++ b/spacelab/bootstrap.min.css @@ -607,10 +607,9 @@ a.thumbnail:hover{border-color:#4183c4;-webkit-box-shadow:0 1px 4px rgba(0, 105, .navbar .navbar-inner{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.4);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.4);box-shadow:0 1px 0 rgba(255, 255, 255, 0.4);-webkit-box-shadow:0 0 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 0 10px rgba(0, 0, 0, 0.1);box-shadow:0 0 10px rgba(0, 0, 0, 0.1);} .navbar .nav>li>a{font-weight:bold;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} .navbar .nav .active>a{background-color:transparent;color:#333333;}.navbar .nav .active>a:hover{background-color:transparent;color:#4183c4;} -.navbar .nav .open.dropdown .dropdown-toggle{color:#4183c4;} +.navbar .nav>li>a:hover,.navbar .nav .open.dropdown .dropdown-toggle{color:#4183c4 !important;} .navbar .nav .dropdown-toggle .caret{border-top-color:#333333;opacity:1;} -.navbar .nav .open.dropdown .caret{border-top-color:#4183c4;} -.navbar .nav .dropdown-toggle:hover .caret{border-top-color:#4183c4;} +.navbar .nav .open.dropdown .caret,.navbar .nav .dropdown-toggle:hover .caret{border-top-color:#4183c4 !important;} .subnav .nav>li>a{font-weight:bold;color:#777;}.subnav .nav>li>a:hover{color:#4183c4;} .subnav .nav>li.active>a{color:#333333;}.subnav .nav>li.active>a:hover{color:#333333;} .navbar-search .search-query,.navbar-search .search-query:hover{border:none;color:#999999;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);}.navbar-search .search-query :-moz-placeholder,.navbar-search .search-query:hover :-moz-placeholder{color:#999999;} diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index de0499c..2e8f1e7 100755 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -42,8 +42,9 @@ } } +.navbar .nav > li > a:hover, .navbar .nav .open.dropdown .dropdown-toggle { - color: @linkColor; + color: @linkColor !important; } .navbar .nav .dropdown-toggle .caret { @@ -51,13 +52,9 @@ opacity: 1; } -.navbar .nav .open.dropdown .caret { - border-top-color: @linkColor; -} - - +.navbar .nav .open.dropdown .caret, .navbar .nav .dropdown-toggle:hover .caret { - border-top-color: @linkColor; + border-top-color: @linkColor !important; } .subnav .nav > li > a { diff --git a/spacelab/variables.less b/spacelab/variables.less index f6242d0..055e0a1 100755 --- a/spacelab/variables.less +++ b/spacelab/variables.less @@ -4,7 +4,6 @@ // ----------------------------------------------------- - // GLOBAL VALUES // --------------------------------------------------