diff options
33 files changed, 579 insertions, 621 deletions
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css index 9c7576c4..82351240 100644 --- a/amelia/bootstrap.css +++ b/amelia/bootstrap.css @@ -4836,41 +4836,44 @@ hr { .navbar .btn-group { padding: 4px; } -.navbar .nav-collapse.collapse .nav li > a { - color: rgba(255, 255, 255, 0.9); - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.navbar .nav-collapse.collapse .nav li > a:hover { - background-color: #d92432; -} -.navbar .nav-collapse.collapse .dropdown-menu li > a:hover, -.navbar .nav-collapse.collapse .dropdown-menu li > a:focus, -.navbar .nav-collapse.collapse .dropdown-submenu:hover > a { - background-image: none; -} -.navbar .nav-collapse.collapse .navbar-form, -.navbar .nav-collapse.collapse .navbar-search { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - border: none; -} -.navbar .nav-collapse.collapse .navbar-search .search-query { - border: 2px solid rgba(255, 255, 255, 0.9); -} -.navbar .nav-collapse.collapse .nav-header { - color: rgba(255, 255, 255, 0.5); -} .navbar-inverse .dropdown-menu li > a:hover, .navbar-inverse .dropdown-menu li > a:focus, .navbar-inverse .dropdown-submenu:hover > a { background-image: none; background-color: #debb27; } -.navbar-inverse .nav-collapse.collapse .nav li > a:hover { - background-color: #e5c953; +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a { + color: rgba(255, 255, 255, 0.9); + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + } + .navbar .nav-collapse .nav li > a:hover { + background-color: #d92432; + } + .navbar .nav-collapse .dropdown-menu li > a:hover, + .navbar .nav-collapse .dropdown-menu li > a:focus, + .navbar .nav-collapse .dropdown-submenu:hover > a { + background-image: none; + } + .navbar .nav-collapse .navbar-form, + .navbar .nav-collapse .navbar-search { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border: none; + } + .navbar .nav-collapse .navbar-search .search-query { + border: 2px solid rgba(255, 255, 255, 0.9); + } + .navbar .nav-collapse .nav-header { + color: rgba(255, 255, 255, 0.5); + } + .navbar-inverse .nav-collapse .nav li > a:hover, + .navbar-inverse .nav-collapse .dropdown-menu a:hover { + background-color: #e5c953 !important; + } } div.subnav { background-color: rgba(42, 99, 105, 0.9); diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css index a24d391b..46c28ed5 100644 --- a/amelia/bootstrap.min.css +++ b/amelia/bootstrap.min.css @@ -819,14 +819,8 @@ hr{border-bottom:1px solid rgba(255, 255, 255, 0.3);} .navbar .navbar-search .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;padding-top:5px;padding-bottom:5px;} .navbar .navbar-text{margin:17px 15px 14px;line-height:20px;} .navbar .btn,.navbar .btn-group{padding:4px;} -.navbar .nav-collapse.collapse .nav li>a{color:rgba(255, 255, 255, 0.9);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#d92432;} -.navbar .nav-collapse.collapse .dropdown-menu li>a:hover,.navbar .nav-collapse.collapse .dropdown-menu li>a:focus,.navbar .nav-collapse.collapse .dropdown-submenu:hover>a{background-image:none;} -.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;} -.navbar .nav-collapse.collapse .navbar-search .search-query{border:2px solid rgba(255, 255, 255, 0.9);} -.navbar .nav-collapse.collapse .nav-header{color:rgba(255, 255, 255, 0.5);} .navbar-inverse .dropdown-menu li>a:hover,.navbar-inverse .dropdown-menu li>a:focus,.navbar-inverse .dropdown-submenu:hover>a{background-image:none;background-color:#debb27;} -.navbar-inverse .nav-collapse.collapse .nav li>a:hover{background-color:#e5c953;} -div.subnav{background-color:rgba(42, 99, 105, 0.9);background-image:none;border:0px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}div.subnav .nav>li.open>a{border-color:transparent;background-color:rgba(255, 255, 255, 0.4);} +@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:rgba(255, 255, 255, 0.9);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.navbar .nav-collapse .nav li>a:hover{background-color:#d92432;} .navbar .nav-collapse .dropdown-menu li>a:hover,.navbar .nav-collapse .dropdown-menu li>a:focus,.navbar .nav-collapse .dropdown-submenu:hover>a{background-image:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;} .navbar .nav-collapse .navbar-search .search-query{border:2px solid rgba(255, 255, 255, 0.9);} .navbar .nav-collapse .nav-header{color:rgba(255, 255, 255, 0.5);} .navbar-inverse .nav-collapse .nav li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#e5c953 !important;}}div.subnav{background-color:rgba(42, 99, 105, 0.9);background-image:none;border:0px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}div.subnav .nav>li.open>a{border-color:transparent;background-color:rgba(255, 255, 255, 0.4);} div.subnav .nav>li>a{color:rgba(255, 255, 255, 0.9);border-color:transparent;} div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} div.subnav .nav>.active>a{background-color:transparent;border-color:transparent;color:rgba(255, 255, 255, 0.9);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} @@ -925,8 +919,7 @@ input,textarea,.search-query,.uneditable-input,.input-append input,.input-append .progress-success.progress-striped .bar{background-color:#48ca3b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress-info .bar{background-image:none;background-color:#00bce1;} .progress-info.progress-striped .bar{background-color:#00bce1;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.modal{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.modal-header{background-color:#ad1d28;color:#ffffff;} +.modal{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.modal-header{background-color:#ad1d28;color:#ffffff;} .modal-body{color:#444444;}.modal-body h1,.modal-body h2,.modal-body h3,.modal-body h4,.modal-body h5,.modal-body h6,.modal-body legend{color:#ad1d28;} .modal-body label,.modal-body .input-file{color:#444444;} .modal-body .help-block,.modal-body .help-inline{color:#aaaaaa;} diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less index 2aec417c..e319468c 100755 --- a/amelia/bootswatch.less +++ b/amelia/bootswatch.less @@ -104,9 +104,23 @@ hr { padding: 4px; } - .nav-collapse.collapse { + &-inverse { + + .dropdown-menu li > a:hover, + .dropdown-menu li > a:focus, + .dropdown-submenu:hover > a { + background-image: none; + background-color: @yellow; + } + } +} + +@media (max-width: @navbarCollapseWidth) { + + .navbar .nav-collapse { .nav li > a { + color: @textColor; .border-radius(0); @@ -136,20 +150,11 @@ hr { } } - &-inverse { + .navbar-inverse .nav-collapse { - .dropdown-menu li > a:hover, - .dropdown-menu li > a:focus, - .dropdown-submenu:hover > a { - background-image: none; - background-color: @yellow; - } - - .nav-collapse.collapse { - - .nav li > a:hover { - background-color: lighten(@navbarInverseBackground, 10%); - } + .nav li > a:hover, + .dropdown-menu a:hover { + background-color: lighten(@navbarInverseBackground, 10%) !important; } } } diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css index a4ef5b6b..94b0e8fc 100644 --- a/cerulean/bootstrap.css +++ b/cerulean/bootstrap.css @@ -4749,20 +4749,18 @@ a.badge:hover { .affix { position: fixed; } -.navbar { - font-family: 'Telex', sans-serif; - text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2); -} .navbar .brand { padding: 16px 20px 14px; - text-shadow: inherit; + font-family: 'Telex', sans-serif; + text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2); } .navbar li { line-height: 20px; } .navbar .nav > li > a { padding: 16px 10px 14px; - text-shadow: inherit; + font-family: 'Telex', sans-serif; + text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2); } .navbar .search-query { border: 1px solid #178acc; @@ -4776,45 +4774,47 @@ a.badge:hover { color: rgba(0, 0, 0, 0.5); text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3); } -.navbar .nav-collapse.collapse .nav li > a { - color: #ffffff; -} -.navbar .nav-collapse.collapse .nav li > a:hover { - background-color: #2B7CAC; -} -.navbar .nav-collapse.collapse .nav .active > a { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background-color: #2B7CAC; -} -.navbar .nav-collapse.collapse .dropdown-menu li > a:hover, -.navbar .nav-collapse.collapse .dropdown-menu li > a:focus, -.navbar .nav-collapse.collapse .dropdown-submenu:hover > a { - background-image: none; -} -.navbar .nav-collapse.collapse .navbar-form, -.navbar .nav-collapse.collapse .navbar-search { - border: none; -} -.navbar .nav-collapse.collapse .nav-header { - color: #2B7CAC; -} -.navbar-inverse { - text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5); -} -.navbar-inverse .nav-collapse.collapse .nav li > a { - color: #555555; -} -.navbar-inverse .nav-collapse.collapse .nav li > a:hover { - background-color: rgba(0, 0, 0, 0.1); -} -.navbar-inverse .nav-collapse.collapse .nav .active > a { - background-color: rgba(0, 0, 0, 0.1); -} .navbar-inverse .navbar-search .search-query { color: #555555; } +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a { + font-family: 'Telex', sans-serif; + font-weight: normal; + color: #ffffff; + text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2); + } + .navbar .nav-collapse .nav li > a:hover { + background-color: #2B7CAC; + } + .navbar .nav-collapse .nav .active > a { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #2B7CAC; + } + .navbar .nav-collapse .dropdown-menu li > a:hover, + .navbar .nav-collapse .dropdown-menu li > a:focus, + .navbar .nav-collapse .dropdown-submenu:hover > a { + background-image: none; + } + .navbar .nav-collapse .navbar-form, + .navbar .nav-collapse .navbar-search { + border: none; + } + .navbar .nav-collapse .nav-header { + color: #2B7CAC; + } + .navbar-inverse .nav-collapse .nav li > a { + color: #555555; + } + .navbar-inverse .nav-collapse .nav li > a:hover { + background-color: rgba(0, 0, 0, 0.1); + } + .navbar-inverse .nav-collapse .nav .active > a { + background-color: rgba(0, 0, 0, 0.1); + } +} div.subnav { font-family: 'Telex', sans-serif; text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2); diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css index 358549c7..4ad3c6ee 100644 --- a/cerulean/bootstrap.min.css +++ b/cerulean/bootstrap.min.css @@ -801,21 +801,14 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .show{display:block;} .invisible{visibility:hidden;} .affix{position:fixed;} -.navbar{font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(0, 0, 0, 0.2);}.navbar .brand{padding:16px 20px 14px;text-shadow:inherit;} +.navbar .brand{padding:16px 20px 14px;font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(0, 0, 0, 0.2);} .navbar li{line-height:20px;} -.navbar .nav>li>a{padding:16px 10px 14px;text-shadow:inherit;} +.navbar .nav>li>a{padding:16px 10px 14px;font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(0, 0, 0, 0.2);} .navbar .search-query{border:1px solid #178acc;} .navbar .btn-navbar:hover{background-color:#cccccc;} .navbar .navbar-text{padding:19px 10px 18px;line-height:13px;color:rgba(0, 0, 0, 0.5);text-shadow:1px 1px 0 rgba(255, 255, 255, 0.3);} -.navbar .nav-collapse.collapse .nav li>a{color:#ffffff;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#2B7CAC;} -.navbar .nav-collapse.collapse .nav .active>a{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#2B7CAC;} -.navbar .nav-collapse.collapse .dropdown-menu li>a:hover,.navbar .nav-collapse.collapse .dropdown-menu li>a:focus,.navbar .nav-collapse.collapse .dropdown-submenu:hover>a{background-image:none;} -.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border:none;} -.navbar .nav-collapse.collapse .nav-header{color:#2B7CAC;} -.navbar-inverse{text-shadow:1px 1px 0 rgba(255, 255, 255, 0.5);}.navbar-inverse .nav-collapse.collapse .nav li>a{color:#555555;}.navbar-inverse .nav-collapse.collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.1);} -.navbar-inverse .nav-collapse.collapse .nav .active>a{background-color:rgba(0, 0, 0, 0.1);} .navbar-inverse .navbar-search .search-query{color:#555555;} -div.subnav{font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(255, 255, 255, 0.2);}div.subnav-fixed{top:50px;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a{font-family:'Telex',sans-serif;font-weight:normal;color:#ffffff;text-shadow:1px 1px 0 rgba(0, 0, 0, 0.2);}.navbar .nav-collapse .nav li>a:hover{background-color:#2B7CAC;} .navbar .nav-collapse .nav .active>a{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#2B7CAC;} .navbar .nav-collapse .dropdown-menu li>a:hover,.navbar .nav-collapse .dropdown-menu li>a:focus,.navbar .nav-collapse .dropdown-submenu:hover>a{background-image:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border:none;} .navbar .nav-collapse .nav-header{color:#2B7CAC;} .navbar-inverse .nav-collapse .nav li>a{color:#555555;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.1);} .navbar-inverse .nav-collapse .nav .active>a{background-color:rgba(0, 0, 0, 0.1);}}div.subnav{font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(255, 255, 255, 0.2);}div.subnav-fixed{top:50px;} .btn{background-color:#ffffff;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(5%, #ffffff), to(#ffffff));background-image:-webkit-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 500%, #ffffff);background-image:-o-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffffffff', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 0;} .btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#3daae9;background-image:-moz-linear-gradient(top, #46aeea, #2fa4e7);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#46aeea), to(#2fa4e7));background-image:-webkit-linear-gradient(top, #46aeea, #2fa4e7);background-image:-o-linear-gradient(top, #46aeea, #2fa4e7);background-image:linear-gradient(to bottom, #46aeea, #2fa4e7);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff46aeea', endColorstr='#ff2fa4e7', GradientType=0);border-color:#2fa4e7 #2fa4e7 #157ab5;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2fa4e7;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#2fa4e7;*background-color:#1a99e2;} .btn-primary:active,.btn-primary.active{background-color:#178acc \9;} diff --git a/cerulean/bootswatch.less b/cerulean/bootswatch.less index 837d8b8c..16270465 100755 --- a/cerulean/bootswatch.less +++ b/cerulean/bootswatch.less @@ -16,12 +16,11 @@ .navbar { - font-family: @headingsFontFamily; - text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2); .brand { padding: 16px 20px 14px; - text-shadow: inherit; + font-family: @headingsFontFamily; + text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2); } li { @@ -30,7 +29,8 @@ .nav > li > a { padding: 16px 10px 14px; - text-shadow: inherit; + font-family: @headingsFontFamily; + text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2); } .search-query { @@ -48,10 +48,24 @@ text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3); } - .nav-collapse.collapse { + &-inverse { + + .navbar-search .search-query { + color: @textColor; + } + } +} + +@media (max-width: @navbarCollapseWidth) { + + .navbar .nav-collapse { .nav li > a { + + font-family: @headingsFontFamily; + font-weight: normal; color: @white; + text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2); &:hover { background-color: #2B7CAC; @@ -79,27 +93,18 @@ } } - &-inverse { - - text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5); - - .nav-collapse.collapse { + .navbar-inverse .nav-collapse { - .nav li > a { - color: @navbarInverseLinkColor; - - &:hover { - background-color: rgba(0, 0, 0, 0.1); - } - } + .nav li > a { + color: @navbarInverseLinkColor; - .nav .active > a { + &:hover { background-color: rgba(0, 0, 0, 0.1); } } - .navbar-search .search-query { - color: @textColor; + .nav .active > a { + background-color: rgba(0, 0, 0, 0.1); } } } diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css index c398ae03..ebf2112f 100644 --- a/cyborg/bootstrap.css +++ b/cyborg/bootstrap.css @@ -4864,26 +4864,6 @@ body { .navbar .search-query.focused::-webkit-input-placeholder { color: #999999; } -.navbar .nav-collapse.collapse .nav li > a { - border-left: 0; - color: #eeeeee; - font-weight: normal; - text-shadow: none; -} -.navbar .nav-collapse.collapse .nav li > a:hover { - background-color: #33b5e5; -} -.navbar .nav-collapse.collapse .nav .active > a { - background-color: #33b5e5; -} -.navbar .nav-collapse.collapse .navbar-form, -.navbar .nav-collapse.collapse .navbar-search { - border-top: none; - border-bottom: none; -} -.navbar .nav-collapse.collapse .nav-header { - color: rgba(128, 128, 128, 0.6); -} .navbar-inverse .navbar-inner { border: none; border-bottom: 3px solid #000000; @@ -4898,6 +4878,44 @@ body { .navbar-inverse .nav .active > a { border-bottom-color: transparent; } +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a { + border: none; + color: #eeeeee; + font-weight: normal; + text-shadow: none; + } + .navbar .nav-collapse .nav li > a:hover { + border: none; + background-color: #33b5e5; + } + .navbar .nav-collapse .nav .active > a { + border: none; + background-color: #33b5e5; + } + .navbar .nav-collapse .dropdown-menu a:hover { + background-color: #33b5e5; + } + .navbar .nav-collapse .navbar-form, + .navbar .nav-collapse .navbar-search { + border-top: none; + border-bottom: none; + } + .navbar .nav-collapse .nav-header { + color: rgba(128, 128, 128, 0.6); + } + .navbar-inverse .nav-collapse .nav li > a:hover { + background-color: #111; + } + .navbar-inverse .nav-collapse .nav .active > a { + background-color: #111; + } + .navbar-inverse .nav-collapse .nav li.dropdown.open > .dropdown-toggle, + .navbar-inverse .nav-collapse .nav li.dropdown.active > .dropdown-toggle, + .navbar-inverse .nav-collapse .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111; + } +} div.subnav { position: static; background-color: #020202; diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css index e9b2b399..266e2bed 100644 --- a/cyborg/bootstrap.min.css +++ b/cyborg/bootstrap.min.css @@ -819,15 +819,11 @@ body{min-height:100%;background-color:#121417;background-image:-moz-linear-gradi .navbar .search-query,.navbar .search-query:focus,.navbar .search-query.focused{color:#adafae;text-shadow:none;background-color:#222;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}.navbar .search-query:-moz-placeholder,.navbar .search-query:focus:-moz-placeholder,.navbar .search-query.focused:-moz-placeholder{color:#999999;} .navbar .search-query:-ms-input-placeholder,.navbar .search-query:focus:-ms-input-placeholder,.navbar .search-query.focused:-ms-input-placeholder{color:#999999;} .navbar .search-query::-webkit-input-placeholder,.navbar .search-query:focus::-webkit-input-placeholder,.navbar .search-query.focused::-webkit-input-placeholder{color:#999999;} -.navbar .nav-collapse.collapse .nav li>a{border-left:0;color:#eeeeee;font-weight:normal;text-shadow:none;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#33b5e5;} -.navbar .nav-collapse.collapse .nav .active>a{background-color:#33b5e5;} -.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:none;border-bottom:none;} -.navbar .nav-collapse.collapse .nav-header{color:rgba(128, 128, 128, 0.6);} .navbar-inverse .navbar-inner{border:none;border-bottom:3px solid #000000;} .navbar-inverse .brand:hover{border-bottom:none;background-color:#000000;} .navbar-inverse .nav li>a:hover{border-bottom-color:transparent;} .navbar-inverse .nav .active>a{border-bottom-color:transparent;} -div.subnav{position:static;background-color:#020202;background-image:none;border:0;}div.subnav.subnav-fixed{position:relative;left:-1px;top:auto;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a{border:none;color:#eeeeee;font-weight:normal;text-shadow:none;}.navbar .nav-collapse .nav li>a:hover{border:none;background-color:#33b5e5;} .navbar .nav-collapse .nav .active>a{border:none;background-color:#33b5e5;} .navbar .nav-collapse .dropdown-menu a:hover{background-color:#33b5e5;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:none;border-bottom:none;} .navbar .nav-collapse .nav-header{color:rgba(128, 128, 128, 0.6);} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:#111;} .navbar-inverse .nav-collapse .nav .active>a{background-color:#111;} .navbar-inverse .nav-collapse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav-collapse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav-collapse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#111;}}div.subnav{position:static;background-color:#020202;background-image:none;border:0;}div.subnav.subnav-fixed{position:relative;left:-1px;top:auto;} div.subnav .nav>li>a,div.subnav .nav .active a{background-color:#020202;border-left:1px solid #222;border-right:0;color:#eeeeee;} div.subnav .nav li.nav-header{text-shadow:none;} div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover,div.subnav .nav>li:first-child>a:hover{background:transparent;border-bottom:2px solid #33b5e5;border-left:1px solid #222;color:#ffffff;} diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less index 1bfc1faa..520e585c 100755 --- a/cyborg/bootswatch.less +++ b/cyborg/bootswatch.less @@ -114,20 +114,50 @@ body { .placeholder(@gray); } - .nav-collapse.collapse { + &-inverse { + + .navbar-inner { + border: none; + border-bottom: 3px solid @black; + } + + .brand:hover { + border-bottom: none; + background-color: @black; + } + + .nav li > a:hover { + border-bottom-color: transparent; + } + + .nav .active > a { + border-bottom-color: transparent; + } + } +} + +@media (max-width: @navbarCollapseWidth) { + + .navbar .nav-collapse { .nav li > a { - border-left: 0; + border: none; color: @grayLighter; font-weight: normal; text-shadow: none; &:hover { + border: none; background-color: @blue; } } .nav .active > a { + border: none; + background-color: @blue; + } + + .dropdown-menu a:hover { background-color: @blue; } @@ -142,24 +172,20 @@ body { } } - &-inverse { - - .navbar-inner { - border: none; - border-bottom: 3px solid @black; - } - - .brand:hover { - border-bottom: none; - background-color: @black; - } + .navbar-inverse .nav-collapse { .nav li > a:hover { - border-bottom-color: transparent; + background-color: #111; } .nav .active > a { - border-bottom-color: transparent; + background-color: #111; + } + + .nav li.dropdown.open > .dropdown-toggle, + .nav li.dropdown.active > .dropdown-toggle, + .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111; } } } diff --git a/journal/bootstrap.css b/journal/bootstrap.css index 78c27abe..7e3aadbf 100644 --- a/journal/bootstrap.css +++ b/journal/bootstrap.css @@ -4836,9 +4836,8 @@ hr { text-shadow: none; text-transform: uppercase; } -.navbar .nav > li.active > a { +.navbar .nav > .active > a { background-color: transparent; - color: #000000; } .navbar .navbar-text { margin-top: 21px; @@ -4854,15 +4853,6 @@ hr { -moz-box-shadow: none; box-shadow: none; } -.navbar .nav li.dropdown > .dropdown-toggle:hover, -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #000000; -} -.navbar .nav li.dropdown > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open > .dropdown-toggle:hover .caret { - border-top-color: #000000; - border-bottom-color: #000000; -} .navbar .dropdown-menu { top: 85%; -webkit-border-radius: 0; @@ -4873,15 +4863,6 @@ hr { font-size: 15px; font-weight: bold; } -.navbar .nav-collapse.collapse .nav li > a { - color: #000000; -} -.navbar .nav-collapse.collapse .nav li > a:hover { - background-color: #eeeeee; -} -.navbar .nav-collapse.collapse .navbar-text { - margin-top: 0; -} .navbar .navbar-search .search-query, .navbar .navbar-search .search-query:hover { border: 2px solid #eeeeee; @@ -4899,6 +4880,30 @@ hr { .navbar .navbar-search .search-query:hover::-webkit-input-placeholder { color: #999999; } +@media (max-width: 979px) { + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { + margin-bottom: 0; + border-top: 2px solid #eeeeee; + border-bottom: 2px solid #eeeeee; + } + .navbar .nav-collapse .nav li > a { + color: #000000; + } + .navbar .nav-collapse .nav li > a:hover { + background-color: #eeeeee; + } + .navbar .nav-collapse .navbar-text { + margin-top: 0; + } + .navbar-inverse .nav-collapse .nav li > a { + color: #bbbbbb; + } + .navbar-inverse .nav-collapse .nav li > a:hover { + background-color: #111; + background-image: none; + } +} div.subnav { height: 54px; background-color: #ffffff; @@ -5062,14 +5067,6 @@ legend { border-color: #e5e5e5; } } -@media (max-width: 979px) { - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - margin-bottom: 0; - border-top: 2px solid #eeeeee; - border-bottom: 2px solid #eeeeee; - } -} .pull-right { float: right; } diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css index a2a8cbef..0225159c 100644 --- a/journal/bootstrap.min.css +++ b/journal/bootstrap.min.css @@ -814,18 +814,14 @@ hr{border-bottom:1px solid #eeeeee;} .navbar{font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;}.navbar .navbar-inner{border-bottom:2px solid #eeeeee;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .brand{padding:16px 20px 20px;font-size:24px;font-weight:bold;text-shadow:none;text-transform:uppercase;} .navbar .nav>li>a{padding:20px 10px 21px;font-size:18px;text-shadow:none;text-transform:uppercase;} -.navbar .nav>li.active>a{background-color:transparent;color:#000000;} +.navbar .nav>.active>a{background-color:transparent;} .navbar .navbar-text{margin-top:21px;padding-left:10px;padding-right:10px;font-size:18px;line-height:18px;} .navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.navbar .nav li.dropdown>.dropdown-toggle:hover,.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#000000;} -.navbar .nav li.dropdown>.dropdown-toggle .caret,.navbar .nav li.dropdown.open>.dropdown-toggle:hover .caret{border-top-color:#000000;border-bottom-color:#000000;} .navbar .dropdown-menu{top:85%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.navbar .dropdown-menu a{font-size:15px;font-weight:bold;} -.navbar .nav-collapse.collapse .nav li>a{color:#000000;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#eeeeee;} -.navbar .nav-collapse.collapse .navbar-text{margin-top:0;} .navbar .navbar-search .search-query,.navbar .navbar-search .search-query:hover{border:2px solid #eeeeee;color:#888888;}.navbar .navbar-search .search-query:-moz-placeholder,.navbar .navbar-search .search-query:hover:-moz-placeholder{color:#999999;} .navbar .navbar-search .search-query:-ms-input-placeholder,.navbar .navbar-search .search-query:hover:-ms-input-placeholder{color:#999999;} .navbar .navbar-search .search-query::-webkit-input-placeholder,.navbar .navbar-search .search-query:hover::-webkit-input-placeholder{color:#999999;} -div.subnav{height:54px;background-color:#ffffff;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:2px solid #eeeeee;border-left:none;border-right:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav.subnav-fixed{top:60px;} +@media (max-width:979px){.nav-collapse .navbar-form,.nav-collapse .navbar-search{margin-bottom:0;border-top:2px solid #eeeeee;border-bottom:2px solid #eeeeee;} .navbar .nav-collapse .nav li>a{color:#000000;}.navbar .nav-collapse .nav li>a:hover{background-color:#eeeeee;} .navbar .nav-collapse .navbar-text{margin-top:0;} .navbar-inverse .nav-collapse .nav li>a{color:#bbbbbb;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:#111;background-image:none;}}div.subnav{height:54px;background-color:#ffffff;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:2px solid #eeeeee;border-left:none;border-right:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav.subnav-fixed{top:60px;} div.subnav .nav>li>a,div.subnav .nav>li:first-child>a,div.subnav .nav>li.active>a{padding:20px 15px;border-left:none;border-right:none;background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;font-family:"News Cycle","Arial Narrow Bold",sans-serif;color:#000000;font-size:15px;font-weight:bold;}div.subnav .nav>li>a:hover,div.subnav .nav>li:first-child>a:hover,div.subnav .nav>li.active>a:hover{padding:20px 15px;background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#000000;} div.subnav li.dropdown>.dropdown-toggle .caret,div.subnav li.dropdown>.dropdown-toggle:hover .caret,div.subnav li.dropdown.open>.dropdown-toggle .caret{border-top-color:#000000;border-bottom-color:#000000;opacity:1;} div.subnav li.dropdown.open .dropdown-toggle,div.subnav li.dropdown.open .dropdown-toggle:hover{background-color:#ffffff;color:#000000;} @@ -840,7 +836,7 @@ legend{border-bottom:2px solid #eeeeee;font-family:"News Cycle","Arial Narrow Bo .modal-header{border-bottom:none;} .modal-footer{border-top:none;background:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .close,.close:hover{border-bottom:none;} -@media (max-width:768px){div.subnav{height:auto;}div.subnav .nav>li.active>a{border-top:none;} div.subnav .nav>li:hover>a,div.subnav .nav>li:first-child:hover>a,div.subnav .nav>li.active:hover>a,div.subnav .nav>li.dropdown.open .dropdown-toggle,div.subnav .nav>li.dropdown.open .dropdown-toggle:hover{background-color:#eeeeee;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-color:#e5e5e5;}}@media (max-width:979px){.nav-collapse .navbar-form,.nav-collapse .navbar-search{margin-bottom:0;border-top:2px solid #eeeeee;border-bottom:2px solid #eeeeee;}}.pull-right{float:right;} +@media (max-width:768px){div.subnav{height:auto;}div.subnav .nav>li.active>a{border-top:none;} div.subnav .nav>li:hover>a,div.subnav .nav>li:first-child:hover>a,div.subnav .nav>li.active:hover>a,div.subnav .nav>li.dropdown.open .dropdown-toggle,div.subnav .nav>li.dropdown.open .dropdown-toggle:hover{background-color:#eeeeee;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-color:#e5e5e5;}}.pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} .show{display:block;} diff --git a/journal/bootswatch.less b/journal/bootswatch.less index 3793d709..8d814619 100755 --- a/journal/bootswatch.less +++ b/journal/bootswatch.less @@ -86,9 +86,8 @@ hr { text-transform: uppercase; } - .nav > li.active > a { + .nav > .active > a { background-color: transparent; - color: @headingsColor; } .navbar-text { @@ -105,17 +104,6 @@ hr { .box-shadow(none); } - .nav li.dropdown > .dropdown-toggle:hover, - .nav li.dropdown.active > .dropdown-toggle:hover { - color: @black; - } - - .nav li.dropdown > .dropdown-toggle .caret, - .nav li.dropdown.open > .dropdown-toggle:hover .caret { - border-top-color: @headingsColor; - border-bottom-color: @headingsColor; - } - .dropdown-menu { top: 85%; @@ -127,10 +115,29 @@ hr { } } - .nav-collapse.collapse { + .navbar-search .search-query, + .navbar-search .search-query:hover { + border: 2px solid @grayLighter; + color: @textColor; + .placeholder(@gray); + } +} + +@media (max-width: @navbarCollapseWidth) { + + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { + margin-bottom: 0; + border-top: 2px solid @grayLighter; + border-bottom: 2px solid @grayLighter; + } + + + + .navbar .nav-collapse { .nav li > a { - color: @headingsColor; + color: @navbarLinkColor; &:hover { background-color: @dropdownLinkBackgroundHover; @@ -142,11 +149,17 @@ hr { } } - .navbar-search .search-query, - .navbar-search .search-query:hover { - border: 2px solid @grayLighter; - color: @textColor; - .placeholder(@gray); + .navbar-inverse .nav-collapse { + + .nav li > a { + color: @navbarInverseLinkColor; + + &:hover { + background-color: #111; + background-image: none; + } + } + } } @@ -306,15 +319,4 @@ legend { .nav > li.dropdown.open.active > a:hover { border-color: #e5e5e5; } -} - -@media (max-width: 979px) { - - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - margin-bottom: 0; - border-top: 2px solid @grayLighter; - border-bottom: 2px solid @grayLighter; - } - -} +}
\ No newline at end of file diff --git a/readable/bootstrap.css b/readable/bootstrap.css index 5d2241f5..267c4c8b 100644 --- a/readable/bootstrap.css +++ b/readable/bootstrap.css @@ -4828,37 +4828,39 @@ small { border-right: 1px solid rgba(128, 128, 128, 0.3); border-left: none; } -.navbar .nav-collapse.collapse .nav li:first-child > a { - margin-bottom: 10px; -} -.navbar .nav-collapse.collapse .nav li > a { - color: #9c0001; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - font-weight: normal; -} -.navbar .nav-collapse.collapse .nav li > a:hover { - background-color: rgba(0, 0, 0, 0.05); - color: #c50001; -} -.navbar .nav-collapse.collapse .navbar-form, -.navbar .nav-collapse.collapse .navbar-search { - border-top: 1px solid rgba(128, 128, 128, 0.2); - border-bottom: 1px solid rgba(128, 128, 128, 0.2); -} -.navbar .nav-collapse.collapse .nav-header { - color: #999999; -} .navbar-inverse .brand:hover { color: #ffffff; } -.navbar-inverse .nav-collapse.collapse .nav li > a { - color: #cdcdcd; -} -.navbar-inverse .nav-collapse.collapse .nav li > a:hover { - background-color: rgba(0, 0, 0, 0.2); - color: #ffffff; +@media (max-width: 979px) { + .navbar .nav-collapse .nav li:first-child > a { + margin-bottom: 10px; + } + .navbar .nav-collapse .nav li > a { + color: #9c0001; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + font-weight: normal; + } + .navbar .nav-collapse .nav li > a:hover { + background-color: rgba(0, 0, 0, 0.05); + color: #c50001; + } + .navbar .nav-collapse .navbar-form, + .navbar .nav-collapse .navbar-search { + border-top: 1px solid rgba(128, 128, 128, 0.2); + border-bottom: 1px solid rgba(128, 128, 128, 0.2); + } + .navbar .nav-collapse .nav-header { + color: #999999; + } + .navbar-inverse .nav-collapse .nav li > a { + color: #cdcdcd; + } + .navbar-inverse .nav-collapse .nav li > a:hover { + background-color: rgba(0, 0, 0, 0.2) !important; + color: #ffffff; + } } div.subnav { -webkit-box-shadow: none; diff --git a/readable/bootstrap.min.css b/readable/bootstrap.min.css index 9f6d3e6c..a1150eab 100644 --- a/readable/bootstrap.min.css +++ b/readable/bootstrap.min.css @@ -817,14 +817,8 @@ code,pre{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background .navbar .search-query{border:1px solid #D4D4D4;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;color:#282828;background-color:#ffffff;} .navbar .navbar-text{margin:15px 15px 0;line-height:1.4em;} .navbar .divider-vertical{border-right:1px solid rgba(128, 128, 128, 0.3);border-left:none;} -.navbar .nav-collapse.collapse .nav li:first-child>a{margin-bottom:10px;} -.navbar .nav-collapse.collapse .nav li>a{color:#9c0001;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-weight:normal;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.05);color:#c50001;} -.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:1px solid rgba(128, 128, 128, 0.2);border-bottom:1px solid rgba(128, 128, 128, 0.2);} -.navbar .nav-collapse.collapse .nav-header{color:#999999;} .navbar-inverse .brand:hover{color:#ffffff;} -.navbar-inverse .nav-collapse.collapse .nav li>a{color:#cdcdcd;} -.navbar-inverse .nav-collapse.collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.2);color:#ffffff;} -div.subnav{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#ffffff;background-image:none;}div.subnav .nav{padding:0;} +@media (max-width:979px){.navbar .nav-collapse .nav li:first-child>a{margin-bottom:10px;} .navbar .nav-collapse .nav li>a{color:#9c0001;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-weight:normal;}.navbar .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.05);color:#c50001;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:1px solid rgba(128, 128, 128, 0.2);border-bottom:1px solid rgba(128, 128, 128, 0.2);} .navbar .nav-collapse .nav-header{color:#999999;} .navbar-inverse .nav-collapse .nav li>a{color:#cdcdcd;} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.2) !important;color:#ffffff;}}div.subnav{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#ffffff;background-image:none;}div.subnav .nav{padding:0;} div.subnav .nav>li.active>a,div.subnav .nav>li:active>a{color:#9c0001;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:transparent;} div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover,div.subnav .nav>li:active>a:hover{background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#c50001;} div.subnav-fixed{top:50px;} diff --git a/readable/bootswatch.less b/readable/bootswatch.less index c09047f6..0d0014ca 100755 --- a/readable/bootswatch.less +++ b/readable/bootswatch.less @@ -97,7 +97,17 @@ code, pre { border-left: none; } - .nav-collapse.collapse { + &-inverse { + + .brand:hover { + color: @white; + } + } +} + +@media (max-width: @navbarCollapseWidth) { + + .navbar .nav-collapse { .nav li:first-child > a { margin-bottom: 10px; @@ -125,24 +135,16 @@ code, pre { } } - &-inverse { + .navbar-inverse .nav-collapse { - .brand:hover { - color: @white; + .nav li > a { + color: @grayLighter; } - .nav-collapse.collapse { - - .nav li > a { - color: @grayLighter; - } - - .nav li > a:hover { - background-color: rgba(0, 0, 0, 0.2); - color: @white; - } + .nav li > a:hover { + background-color: rgba(0, 0, 0, 0.2) !important; + color: @white; } - } } diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index 6617ec4b..40e34d2a 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -4797,33 +4797,6 @@ hr { .navbar .dropdown-menu a { font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; } -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #d9230f; -} -.navbar .nav li.dropdown .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; - opacity: 1; -} -.navbar .nav li.dropdown .dropdown-toggle:hover .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .dropdown-toggle .caret { - border-top-color: #d9230f; - border-bottom-color: #d9230f; -} -.navbar .nav-collapse.collapse .nav li > a { - color: #555555; -} -.navbar .nav-collapse.collapse .nav li > a:hover { - background-image: none; - background-color: #fbebe9; -} -.navbar .nav-collapse.collapse .navbar-form, -.navbar .nav-collapse.collapse .navbar-search { - border-top: 1px solid rgba(128, 128, 128, 0.3); - border-bottom: 1px solid rgba(128, 128, 128, 0.3); -} .navbar-inverse .navbar-inner { -webkit-box-shadow: none; -moz-box-shadow: none; @@ -4832,24 +4805,33 @@ hr { .navbar-inverse .brand:hover { color: #ffffff; } -.navbar-inverse .nav li.dropdown.open .dropdown-toggle { - color: #ffffff; -} -.navbar-inverse .nav li.dropdown .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown .dropdown-toggle:hover .caret, -.navbar-inverse .nav li.dropdown.active .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.open .dropdown-toggle .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar-inverse .nav-collapse.collapse .nav li > a { - color: #ffffff; -} -.navbar-inverse .nav-collapse.collapse .nav li > a:hover { - background-color: rgba(255, 255, 255, 0.1); -} -.navbar-inverse .nav-collapse.collapse .nav-header { - color: rgba(255, 255, 255, 0.7); +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a { + color: #555555; + } + .navbar .nav-collapse .nav li > a:hover { + background-image: none; + background-color: #fbebe9; + } + .navbar .nav-collapse .nav .active > a { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .navbar .nav-collapse .navbar-form, + .navbar .nav-collapse .navbar-search { + border-top: 1px solid rgba(128, 128, 128, 0.3); + border-bottom: 1px solid rgba(128, 128, 128, 0.3); + } + .navbar-inverse .nav-collapse .nav li > a { + color: #ffffff; + } + .navbar-inverse .nav-collapse .nav li > a:hover { + background-color: rgba(255, 255, 255, 0.1) !important; + } + .navbar-inverse .nav-collapse .nav-header { + color: rgba(255, 255, 255, 0.7); + } } div.subnav { background-image: none; @@ -4885,28 +4867,6 @@ div.subnav .nav > li.active > a:hover { box-shadow: none; color: #d9230f; } -div.subnav .nav > li.dropdown.open > a, -div.subnav .nav > li.dropdown.open > a:hover { - border-left-color: transparent; - border-right-color: transparent; - background-color: transparent; - color: #d9230f; -} -div.subnav .nav li.dropdown .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; - opacity: 1; -} -div.subnav .nav li.dropdown .dropdown-toggle:hover .caret, -div.subnav .nav li.dropdown.active .dropdown-toggle .caret, -div.subnav .nav li.dropdown.open .dropdown-toggle .caret { - border-top-color: #d9230f; - border-bottom-color: #d9230f; - opacity: 1; -} -div.subnav .dropdown.open:hover .dropdown-toggle { - background-color: transparent; -} .nav .nav-header { font-size: 13px; font-weight: normal; @@ -5109,13 +5069,6 @@ i[class^="icon-"] { .modal-footer { background-color: #f7f7f7; } -@media (max-width: 979px) { - .nav-collapse.collapse .navbar-form, - .nav-collapse.collapse .navbar-search { - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #eeeeee; - } -} .pull-right { float: right; } diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css index 7e5af63c..1351f52f 100644 --- a/simplex/bootstrap.min.css +++ b/simplex/bootstrap.min.css @@ -810,24 +810,11 @@ hr{border-bottom:none;} .navbar .divider-vertical{height:39px;background-color:#eeeeee;} .navbar .navbar-search{margin-top:5px;}.navbar .navbar-search input[type="text"]{margin-bottom:5px;} .navbar .dropdown-menu a{font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;} -.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#d9230f;} -.navbar .nav li.dropdown .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;opacity:1;} -.navbar .nav li.dropdown .dropdown-toggle:hover .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open .dropdown-toggle .caret{border-top-color:#d9230f;border-bottom-color:#d9230f;} -.navbar .nav-collapse.collapse .nav li>a{color:#555555;}.navbar .nav-collapse.collapse .nav li>a:hover{background-image:none;background-color:#fbebe9;} -.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:1px solid rgba(128, 128, 128, 0.3);border-bottom:1px solid rgba(128, 128, 128, 0.3);} .navbar-inverse .navbar-inner{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar-inverse .brand:hover{color:#ffffff;} -.navbar-inverse .nav li.dropdown.open .dropdown-toggle{color:#ffffff;} -.navbar-inverse .nav li.dropdown .dropdown-toggle .caret,.navbar-inverse .nav li.dropdown .dropdown-toggle:hover .caret,.navbar-inverse .nav li.dropdown.active .dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open .dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} -.navbar-inverse .nav-collapse.collapse .nav li>a{color:#ffffff;}.navbar-inverse .nav-collapse.collapse .nav li>a:hover{background-color:rgba(255, 255, 255, 0.1);} -.navbar-inverse .nav-collapse.collapse .nav-header{color:rgba(255, 255, 255, 0.7);} -div.subnav{background-image:none;background-color:#fefefe;border-bottom:1px solid transparent;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}div.subnav.subnav-fixed{-webkit-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);} +@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#555555;}.navbar .nav-collapse .nav li>a:hover{background-image:none;background-color:#fbebe9;} .navbar .nav-collapse .nav .active>a{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:1px solid rgba(128, 128, 128, 0.3);border-bottom:1px solid rgba(128, 128, 128, 0.3);} .navbar-inverse .nav-collapse .nav li>a{color:#ffffff;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(255, 255, 255, 0.1) !important;} .navbar-inverse .nav-collapse .nav-header{color:rgba(255, 255, 255, 0.7);}}div.subnav{background-image:none;background-color:#fefefe;border-bottom:1px solid transparent;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}div.subnav.subnav-fixed{-webkit-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);} div.subnav .nav>li>a{padding:14px 12px 10px;color:#555555;border-left-color:transparent;border-right-color:transparent;}div.subnav .nav>li>a:hover{background-color:transparent;color:#d9230f;} div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{border-left-color:transparent;border-right-color:transparent;background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#d9230f;} -div.subnav .nav>li.dropdown.open>a,div.subnav .nav>li.dropdown.open>a:hover{border-left-color:transparent;border-right-color:transparent;background-color:transparent;color:#d9230f;} -div.subnav .nav li.dropdown .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;opacity:1;} -div.subnav .nav li.dropdown .dropdown-toggle:hover .caret,div.subnav .nav li.dropdown.active .dropdown-toggle .caret,div.subnav .nav li.dropdown.open .dropdown-toggle .caret{border-top-color:#d9230f;border-bottom-color:#d9230f;opacity:1;} -div.subnav .dropdown.open:hover .dropdown-toggle{background-color:transparent;} .nav .nav-header{font-size:13px;font-weight:normal;text-transform:none;} .nav-tabs >li>a{background-color:#efefef;border:1px solid #ccc;color:#555555;}.nav-tabs >li>a:hover{border:1px solid #ccc;background-color:#fbebe9;color:#d9230f;} .nav-tabs >li.active>a,.nav-tabs >li.active>a:hover{background-color:#f7f7f7;} @@ -864,7 +851,7 @@ i[class^="icon-"]{opacity:0.5;vertical-align:-2px;} .modal-header{border-bottom:none;} .modal-header,.modal-body{background-color:#fefefe;} .modal-footer{background-color:#f7f7f7;} -@media (max-width:979px){.nav-collapse.collapse .navbar-form,.nav-collapse.collapse .navbar-search{border-top:1px solid #eeeeee;border-bottom:1px solid #eeeeee;}}.pull-right{float:right;} +.pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} .show{display:block;} diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index 30cd90ad..5917fc8f 100755 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -76,31 +76,21 @@ hr { font-family: @headingsFontFamily; } - .nav li.dropdown.open > .dropdown-toggle, - .nav li.dropdown.active > .dropdown-toggle:hover { - color: @linkColor; - } + &-inverse { - .nav li.dropdown .dropdown-toggle .caret { - border-top-color: @textColor; - border-bottom-color: @textColor; - opacity: 1; - } + .navbar-inner { + .box-shadow(none); + } - .nav li.dropdown .dropdown-toggle:hover .caret, - .nav li.dropdown.active > .dropdown-toggle .caret, - .nav li.dropdown.open .dropdown-toggle .caret { - border-top-color: @linkColor; - border-bottom-color: @linkColor; + .brand:hover { + color: @white; + } } +} - .nav > .active > a, - .nav > .active > a:hover, - .nav > .active > a:focus { - // .box-shadow(none); - } +@media (max-width: @navbarCollapseWidth) { - .nav-collapse.collapse { + .navbar .nav-collapse { .nav li > a { color: @textColor; @@ -111,6 +101,9 @@ hr { } } + .nav .active > a { + .box-shadow(none); + } .navbar-form, .navbar-search { @@ -119,41 +112,18 @@ hr { } } - &-inverse { - - .navbar-inner { - .box-shadow(none); - } + .navbar-inverse .nav-collapse { - .brand:hover { - color: @white; - } - - .nav li.dropdown.open .dropdown-toggle { + .nav li > a { color: @white; - } - .nav li.dropdown .dropdown-toggle .caret, - .nav li.dropdown .dropdown-toggle:hover .caret, - .nav li.dropdown.active .dropdown-toggle .caret, - .nav li.dropdown.open .dropdown-toggle .caret { - border-top-color: @white; - border-bottom-color: @white; - } - - .nav-collapse.collapse { - - .nav li > a { - color: @white; - - &:hover { - background-color: rgba(255, 255, 255, 0.1); - } + &:hover { + background-color: rgba(255, 255, 255, 0.1) !important; } + } - .nav-header { - color: rgba(255, 255, 255, 0.7); - } + .nav-header { + color: rgba(255, 255, 255, 0.7); } } } @@ -190,32 +160,6 @@ div.subnav { .box-shadow(none); color: @linkColor; } - - .nav > li.dropdown.open > a, - .nav > li.dropdown.open > a:hover { - border-left-color: transparent; - border-right-color: transparent; - background-color: transparent; - color: @linkColor; - } - - .nav li.dropdown .dropdown-toggle .caret { - border-top-color: @textColor; - border-bottom-color: @textColor; - opacity: 1; - } - - .nav li.dropdown .dropdown-toggle:hover .caret, - .nav li.dropdown.active .dropdown-toggle .caret, - .nav li.dropdown.open .dropdown-toggle .caret { - border-top-color: @linkColor; - border-bottom-color: @linkColor; - opacity: 1; - } - - .dropdown.open:hover .dropdown-toggle { - background-color: transparent; - } } // NAV @@ -492,12 +436,3 @@ i[class^="icon-"]{ // MEDIA QUERIES // ----------------------------------------------------- - -@media (max-width: 979px) { - - .nav-collapse.collapse .navbar-form, - .nav-collapse.collapse .navbar-search { - border-top: 1px solid @grayLighter; - border-bottom: 1px solid @grayLighter; - } -} diff --git a/slate/bootstrap.css b/slate/bootstrap.css index 18e172c5..8d003b89 100644 --- a/slate/bootstrap.css +++ b/slate/bootstrap.css @@ -4825,32 +4825,6 @@ legend, .navbar .dropdown-menu::after { border-bottom: 6px solid #3a3f44; } -.navbar .nav-collapse.collapse .nav li > a, -.navbar .nav-collapse.collapse .nav li.active > a, -.navbar .nav-collapse.collapse .nav li > a:hover, -.navbar .nav-collapse.collapse .nav li.active > a:hover { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - color: #bbbfc2; - border: 1px solid transparent; - background-color: transparent; - background-image: none; -} -.navbar .nav-collapse.collapse .nav li > a:hover, -.navbar .nav-collapse.collapse .nav li.active > a:hover { - background-color: #272b30; -} -.navbar .nav-collapse.collapse .navbar-form, -.navbar .nav-collapse.collapse .navbar-search { - border-color: transparent; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.navbar .nav-collapse.collapse .nav-header { - color: #757c82; -} .navbar-inverse .navbar-inner { background-color: #151719; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#202328), color-stop(70%, #151719), to(#151719)); @@ -4875,6 +4849,38 @@ legend, background-image: -o-linear-gradient(280deg, #202328, #272b30); background-image: linear-gradient(280deg, #202328, #272b30); } +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a, + .navbar .nav-collapse .nav li > a:hover, + .navbar .nav-collapse .nav .active > a, + .navbar .nav-collapse .nav .active > a:hover { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + color: #bbbfc2; + border: 1px solid transparent; + background-color: transparent; + background-image: none; + } + .navbar .nav-collapse .nav li > a:hover, + .navbar .nav-collapse .nav .active > a:hover { + background-color: #272b30; + } + .navbar .nav-collapse .navbar-form, + .navbar .nav-collapse .navbar-search { + border-color: transparent; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .navbar .nav-collapse .nav-header { + color: #757c82; + } + .navbar-inverse .nav-collapse .nav li > a:hover, + .navbar-inverse .nav-collapse .nav .active > a:hover { + background-color: #272b30 !important; + } +} div.subnav { background-color: #3a3f44; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44)); diff --git a/slate/bootstrap.min.css b/slate/bootstrap.min.css index 945b34a2..83199b80 100644 --- a/slate/bootstrap.min.css +++ b/slate/bootstrap.min.css @@ -811,14 +811,10 @@ hr,legend,.page-header{border-top:none;border-bottom:1px solid #1c1e22;backgroun .navbar .navbar-search .search-query{border:1px solid #2e3134;} .navbar .divider-vertical{background-color:transparent;border-right:none;} .navbar .dropdown-menu::after{border-bottom:6px solid #3a3f44;} -.navbar .nav-collapse.collapse .nav li>a,.navbar .nav-collapse.collapse .nav li.active>a,.navbar .nav-collapse.collapse .nav li>a:hover,.navbar .nav-collapse.collapse .nav li.active>a:hover{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#bbbfc2;border:1px solid transparent;background-color:transparent;background-image:none;} -.navbar .nav-collapse.collapse .nav li>a:hover,.navbar .nav-collapse.collapse .nav li.active>a:hover{background-color:#272b30;} -.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.navbar .nav-collapse.collapse .nav-header{color:#757c82;} .navbar-inverse .navbar-inner{background-color:#151719;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#202328), color-stop(70%, #151719), to(#151719));background-image:-webkit-linear-gradient(#202328, #151719 70%, #151719);background-image:-moz-linear-gradient(top, #202328, #151719 7000%, #151719);background-image:-o-linear-gradient(#202328, #151719 70%, #151719);background-image:linear-gradient(#202328, #151719 70%, #151719);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff202328', endColorstr='#ff151719', GradientType=0);} .navbar-inverse .nav li>a{background-image:none;background-color:transparent;} .navbar-inverse .nav li>a:hover,.navbar-inverse .nav li.active>a,.navbar-inverse .nav li.active>a:hover{background-color:#272b30;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #202328, #272b30);background-image:-webkit-linear-gradient(280deg, #202328, #272b30);background-image:-o-linear-gradient(280deg, #202328, #272b30);background-image:linear-gradient(280deg, #202328, #272b30);} -div.subnav{background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';}div.subnav .nav>li>a{color:#bbbfc2;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);border-right:1px solid #2e3134;border-left:1px solid #52575c;}div.subnav .nav>li>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;border-right:1px solid transparent;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a,.navbar .nav-collapse .nav li>a:hover,.navbar .nav-collapse .nav .active>a,.navbar .nav-collapse .nav .active>a:hover{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#bbbfc2;border:1px solid transparent;background-color:transparent;background-image:none;} .navbar .nav-collapse .nav li>a:hover,.navbar .nav-collapse .nav .active>a:hover{background-color:#272b30;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .nav-collapse .nav-header{color:#757c82;} .navbar-inverse .nav-collapse .nav li>a:hover,.navbar-inverse .nav-collapse .nav .active>a:hover{background-color:#272b30 !important;}}div.subnav{background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';}div.subnav .nav>li>a{color:#bbbfc2;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);border-right:1px solid #2e3134;border-left:1px solid #52575c;}div.subnav .nav>li>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;border-right:1px solid transparent;} div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#43494f;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #30353b, #43494f);background-image:-webkit-linear-gradient(280deg, #30353b, #43494f);background-image:-o-linear-gradient(280deg, #30353b, #43494f);background-image:linear-gradient(280deg, #30353b, #43494f);border-right:1px solid #2e3134;} div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{border-left:1px solid transparent;} div.subnav.subnav-fixed .nav>li.active:first-child>a,div.subnav.subnav-fixed .nav>li:first-child>a:hover{border-left:1px solid #2e3134;} diff --git a/slate/bootswatch.less b/slate/bootswatch.less index 6dd84fa6..9d7c443c 100755 --- a/slate/bootswatch.less +++ b/slate/bootswatch.less @@ -78,12 +78,33 @@ hr, legend, .page-header { border-bottom: 6px solid @grayDark; } - .nav-collapse.collapse { + &-inverse { + + .navbar-inner { + #gradient > .vertical-three-colors(darken(@grayDarker, 3%), darken(@grayDarker, 8%), 70%, darken(@grayDarker, 8%)); + } + + .nav li > a { + background-image: none; + background-color: transparent; + } - .nav li > a, - .nav li.active > a, .nav li > a:hover, + .nav li.active > a, .nav li.active > a:hover { + #gradient > .directional(darken(@grayDarker, 3%), @grayDarker, 280deg); + } + } +} + +@media (max-width: @navbarCollapseWidth) { + + .navbar .nav-collapse { + + .nav li > a, + .nav li > a:hover, + .nav .active > a, + .nav .active > a:hover { .box-shadow(none); color: @grayLighter; border: 1px solid transparent; @@ -92,7 +113,7 @@ hr, legend, .page-header { } .nav li > a:hover, - .nav li.active > a:hover { + .nav .active > a:hover { background-color: @grayDarker; } @@ -107,26 +128,17 @@ hr, legend, .page-header { } } - &-inverse { - - .navbar-inner { - #gradient > .vertical-three-colors(darken(@grayDarker, 3%), darken(@grayDarker, 8%), 70%, darken(@grayDarker, 8%)); - } - - .nav li > a { - background-image: none; - background-color: transparent; - } + .navbar-inverse .nav-collapse { .nav li > a:hover, - .nav li.active > a, - .nav li.active > a:hover { - #gradient > .directional(darken(@grayDarker, 3%), @grayDarker, 280deg); + .nav .active > a:hover { + background-color: @grayDarker !important; } } } div.subnav { + #gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark); border: 1px solid transparent; .box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)'); diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 7c147000..2825c928 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -4800,15 +4800,6 @@ a.badge:hover { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5); color: #2d2d2d; } -.navbar .nav-collapse.collapse .navbar-search { - border-top: none; - border-bottom: none; -} -.navbar .nav-collapse.collapse > .nav li > a:hover { - background-color: #558bc4; - color: #ffffff; - text-shadow: none; -} .navbar-inverse .brand { text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); } @@ -4823,10 +4814,6 @@ a.badge:hover { .navbar-inverse .nav li.dropdown.open:hover > .dropdown-toggle .caret { border-top-color: #ffffff; } -.navbar-inverse .nav-collapse.collapse .nav li > a, -.navbar-inverse .nav-collapse.collapse .nav-header { - color: #eeeeee; -} .navbar-inverse .navbar-search .search-query, .navbar-inverse .navbar-search .search-query:hover { color: #ffffff; @@ -4843,6 +4830,26 @@ a.badge:hover { .navbar-inverse .navbar-search .search-query:hover::-webkit-input-placeholder { color: #eeeeee; } +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a:hover { + background-color: #558bc4; + color: #ffffff; + text-shadow: none; + } + .navbar .nav-collapse .navbar-search { + border-top: none; + border-bottom: none; + } + .navbar-inverse .nav-collapse .nav li > a { + color: #eeeeee; + } + .navbar-inverse .nav-collapse .nav li > a:hover { + background-color: #558bc4 !important; + } + .navbar-inverse .nav-collapse .nav-header { + color: #eeeeee; + } +} div.subnav .nav > li > a { color: #2d2d2d; } diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css index 2fc0cbc2..2050111d 100644 --- a/spacelab/bootstrap.min.css +++ b/spacelab/bootstrap.min.css @@ -809,16 +809,13 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .navbar .navbar-search .search-query:-ms-input-placeholder,.navbar .navbar-search .search-query:hover:-ms-input-placeholder{color:#bbbbbb;} .navbar .navbar-search .search-query::-webkit-input-placeholder,.navbar .navbar-search .search-query:hover::-webkit-input-placeholder{color:#bbbbbb;} .navbar .navbar-search .search-query:focus,.navbar .navbar-search .search-query:hover:focus,.navbar .navbar-search .search-query.focused,.navbar .navbar-search .search-query:hover.focused{-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);color:#2d2d2d;} -.navbar .nav-collapse.collapse .navbar-search{border-top:none;border-bottom:none;} -.navbar .nav-collapse.collapse >.nav li>a:hover{background-color:#558bc4;color:#ffffff;text-shadow:none;} .navbar-inverse .brand{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}.navbar-inverse .brand:hover{color:#ffffff;} .navbar-inverse .nav>li>a{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);} .navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown:hover>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open:hover>.dropdown-toggle .caret{border-top-color:#ffffff;} -.navbar-inverse .nav-collapse.collapse .nav li>a,.navbar-inverse .nav-collapse.collapse .nav-header{color:#eeeeee;} .navbar-inverse .navbar-search .search-query,.navbar-inverse .navbar-search .search-query:hover{color:#ffffff;}.navbar-inverse .navbar-search .search-query:-moz-placeholder,.navbar-inverse .navbar-search .search-query:hover:-moz-placeholder{color:#eeeeee;} .navbar-inverse .navbar-search .search-query:-ms-input-placeholder,.navbar-inverse .navbar-search .search-query:hover:-ms-input-placeholder{color:#eeeeee;} .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder,.navbar-inverse .navbar-search .search-query:hover::-webkit-input-placeholder{color:#eeeeee;} -div.subnav .nav>li>a{color:#2d2d2d;}div.subnav .nav>li>a:hover{color:#558bc4;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a:hover{background-color:#558bc4;color:#ffffff;text-shadow:none;} .navbar .nav-collapse .navbar-search{border-top:none;border-bottom:none;} .navbar-inverse .nav-collapse .nav li>a{color:#eeeeee;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:#558bc4 !important;} .navbar-inverse .nav-collapse .nav-header{color:#eeeeee;}}div.subnav .nav>li>a{color:#2d2d2d;}div.subnav .nav>li>a:hover{color:#558bc4;} div.subnav .nav>li.active>a{color:#2d2d2d;}div.subnav .nav>li.active>a:hover{color:#2d2d2d;} div.subnav .nav>li.dropdown>.dropdown-toggle{background-color:transparent;} div.subnav .nav>li.dropdown.open>.dropdown-toggle{border-left:1px solid whiteSmoke;border-right:1px solid #E5E5E5;color:#2d2d2d;}div.subnav .nav>li.dropdown.open>.dropdown-toggle:hover{color:#558bc4;} diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index fe41fd82..55da0c11 100755 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -56,20 +56,6 @@ } } - .nav-collapse.collapse { - - .navbar-search { - border-top: none; - border-bottom: none; - } - - & > .nav li > a:hover { - background-color: @linkColor; - color: @white; - text-shadow: none; - } - } - &-inverse { .brand { @@ -90,13 +76,6 @@ border-top-color: @white; } - .nav-collapse.collapse { - .nav li > a, - .nav-header { - color: @grayLighter; - } - } - .navbar-search .search-query, .navbar-search .search-query:hover { @@ -107,6 +86,38 @@ } } +@media (max-width: @navbarCollapseWidth) { + + .navbar .nav-collapse { + + .nav li > a:hover { + background-color: @linkColor; + color: @white; + text-shadow: none; + } + + .navbar-search { + border-top: none; + border-bottom: none; + } + } + + .navbar-inverse .nav-collapse { + + .nav li > a { + color: @grayLighter; + + &:hover { + background-color: @linkColor !important; + } + } + + .nav-header { + color: @grayLighter; + } + } +} + div.subnav { .nav > li > a { diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css index 73831c7e..75bd39bb 100644 --- a/spruce/bootstrap.css +++ b/spruce/bootstrap.css @@ -4863,13 +4863,6 @@ blockquote small { .navbar .btn-navbar { margin-top: 14px; } -.navbar .nav-collapse.in .nav li > a { - color: #f5f3dc; -} -.navbar .nav-collapse.in .nav li > a:hover { - color: #ebd90b; - background-color: #01584c; -} .navbar .navbar-form, .navbar .navbar-search { border-color: transparent; @@ -4877,6 +4870,18 @@ blockquote small { -moz-box-shadow: none; box-shadow: none; } +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a { + color: #f5f3dc; + } + .navbar .nav-collapse .nav li > a:hover { + color: #ebd90b; + background-color: #01584c; + } + .navbar-inverse .nav-collapse .nav li > a:hover { + background-color: rgba(0, 0, 0, 0.06) !important; + } +} div.subnav { background-color: #015b4e; background-image: none; diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css index cd6777d1..213f82bb 100644 --- a/spruce/bootstrap.min.css +++ b/spruce/bootstrap.min.css @@ -825,9 +825,8 @@ blockquote small{color:#013435;} .navbar .nav>.open>.dropdown-menu{background-color:#f5f3dc;color:#013435;border-color:transparent;} .navbar .nav>.open>.dropdown-menu a:hover{background-color:#748c73;color:#f5f3dc;} .navbar .btn-navbar{margin-top:14px;} -.navbar .nav-collapse.in .nav li>a{color:#f5f3dc;}.navbar .nav-collapse.in .nav li>a:hover{color:#ebd90b;background-color:#01584c;} .navbar .navbar-form,.navbar .navbar-search{border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;-webkit-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);font-size:18px;}div.subnav .nav>li>a{padding:13px 12px 9px;border-color:transparent;background-color:transparent;font-family:'Josefin Slab',serif;font-weight:700;color:#f5f3dc;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#f5f3dc;}.navbar .nav-collapse .nav li>a:hover{color:#ebd90b;background-color:#01584c;} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.06) !important;}}div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;-webkit-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);font-size:18px;}div.subnav .nav>li>a{padding:13px 12px 9px;border-color:transparent;background-color:transparent;font-family:'Josefin Slab',serif;font-weight:700;color:#f5f3dc;} div.subnav .nav>li+li>a{border-color:transparent;} div.subnav .nav>li.active>a,div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover,div.subnav .dropdown.open .dropdown-toggle,div.subnav .dropdown.open.active .dropdown-toggle:hover{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:transparent;border-color:transparent;color:#ebd90b;} div.subnav .dropdown.open>.dropdown-menu{background-color:#f5f3dc;color:#013435;border-color:transparent;} diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less index 24235df7..91c32aeb 100755 --- a/spruce/bootswatch.less +++ b/spruce/bootswatch.less @@ -146,21 +146,35 @@ blockquote { margin-top: 14px; } - .nav-collapse.in .nav li > a { - color: @headingsColor; - - &:hover { - color: @yellow; - background-color: @blue; - } - } - .navbar-form, .navbar-search { border-color: transparent; .box-shadow(none); } } +@media (max-width: @navbarCollapseWidth) { + + .navbar .nav-collapse { + + .nav li > a { + color: @headingsColor; + + &:hover { + color: @yellow; + background-color: @blue; + } + } + } + + .navbar-inverse .nav-collapse { + + .nav li > a:hover { + background-color: rgba(0, 0, 0, 0.06) !important; + } + + } +} + div.subnav { background-color: @green; background-image: none; diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css index d72d4f41..fe442221 100644 --- a/superhero/bootstrap.css +++ b/superhero/bootstrap.css @@ -4867,28 +4867,30 @@ blockquote.pull-right { background-color: #45515f; border-color: transparent; } -.navbar .nav-collapse.collapse { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar .nav-collapse.collapse .navbar-form, -.navbar .nav-collapse.collapse .navbar-search { - border-top: none; - border-bottom: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.navbar .nav-collapse.collapse .nav-header { - color: #ece9d7; -} -.navbar .nav-collapse.collapse .nav li > a { - color: #e36b23; -} -.navbar .nav-collapse.collapse .nav li > a:hover { - background-color: #5a6a7d; - background-image: none; +@media (max-width: 979px) { + .navbar .nav-collapse { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + } + .navbar .nav-collapse .nav li > a { + color: #e36b23; + } + .navbar .nav-collapse .nav li > a:hover { + background-color: #5a6a7d !important; + background-image: none; + } + .navbar .nav-collapse .navbar-form, + .navbar .nav-collapse .navbar-search { + border-top: none; + border-bottom: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .navbar .nav-collapse .nav-header { + color: #ece9d7; + } } div.subnav { background-color: #45515f; diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css index 0a3bc22c..c731c20f 100644 --- a/superhero/bootstrap.min.css +++ b/superhero/bootstrap.min.css @@ -824,10 +824,7 @@ blockquote.pull-right{border-right:5px solid #45515f;} .navbar .dropdown-menu::after{left:20px;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #5a6a7d;} .navbar [class^="icon-"],.navbar [class*=" icon-"]{vertical-align:20%;} .navbar .btn-navbar{background-color:#45515f;border-color:transparent;} -.navbar .nav-collapse.collapse{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:none;border-bottom:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.navbar .nav-collapse.collapse .nav-header{color:#ece9d7;} -.navbar .nav-collapse.collapse .nav li>a{color:#e36b23;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#5a6a7d;background-image:none;} -div.subnav{background-color:#45515f;background-image:none;border:none;}div.subnav .nav>li>a,div.subnav .nav>li.active>a{border-left:none;border-right:none;color:#ece9d7;} +@media (max-width:979px){.navbar .nav-collapse{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .nav-collapse .nav li>a{color:#e36b23;}.navbar .nav-collapse .nav li>a:hover{background-color:#5a6a7d !important;background-image:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:none;border-bottom:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .nav-collapse .nav-header{color:#ece9d7;}}div.subnav{background-color:#45515f;background-image:none;border:none;}div.subnav .nav>li>a,div.subnav .nav>li.active>a{border-left:none;border-right:none;color:#ece9d7;} div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover{background-color:#5a6a7d;} div.subnav .nav>li+li>a{border-top:0px solid transparent;} div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover,div.subnav .nav>li.active:first-child>a,div.subnav .nav>li.active:first-child>a:hover{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less index 077e0415..04f8f11c 100755 --- a/superhero/bootswatch.less +++ b/superhero/bootswatch.less @@ -139,11 +139,23 @@ blockquote.pull-right { background-color: @blue; border-color: transparent; } +} + +@media (max-width: @navbarCollapseWidth) { - .nav-collapse.collapse { + .navbar .nav-collapse { .border-radius(4px); + .nav li > a { + color: @orange; + + &:hover { + background-color: lighten(@blue, 10%) !important; + background-image: none; + } + } + .navbar-form, .navbar-search { border-top: none; @@ -154,15 +166,6 @@ blockquote.pull-right { .nav-header { color: @textColor; } - - .nav li > a { - color: @orange; - - &:hover { - background-color: lighten(@blue, 10%); - background-image: none; - } - } } } @@ -656,4 +659,4 @@ label { } } } -} +}
\ No newline at end of file diff --git a/united/bootstrap.css b/united/bootstrap.css index e86d6f88..3b589251 100644 --- a/united/bootstrap.css +++ b/united/bootstrap.css @@ -4773,25 +4773,27 @@ a.badge:hover { margin-bottom: 3px; border: 1px solid #97310e; } -.navbar .nav-collapse.collapse .nav li > a { - color: #ffffff; - border-left: 0px solid #dd4814; - border-right: 0px solid #dd4814; -} -.navbar .nav-collapse.collapse .nav li > a:hover { - background-color: rgba(0, 0, 0, 0.3); - background-image: none; -} -.navbar .nav-collapse.collapse .navbar-form, -.navbar .nav-collapse.collapse .navbar-search { - border-top: 0px solid #dd4814; - border-bottom: 0px solid #dd4814; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.navbar .nav-collapse.collapse .nav-header { - color: #f5f5f5; +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a { + color: #ffffff; + border-left: 0px solid #dd4814; + border-right: 0px solid #dd4814; + } + .navbar .nav-collapse .nav li > a:hover { + background-color: rgba(0, 0, 0, 0.3) !important; + background-image: none; + } + .navbar .nav-collapse .navbar-form, + .navbar .nav-collapse .navbar-search { + border-top: 0px solid #dd4814; + border-bottom: 0px solid #dd4814; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .navbar .nav-collapse .nav-header { + color: #f5f5f5; + } } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css index 18b68af9..1a3d6d57 100644 --- a/united/bootstrap.min.css +++ b/united/bootstrap.min.css @@ -806,10 +806,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .navbar .divider-vertical{background-color:inherit;border-right:1px solid rgba(0, 0, 0, 0.2);} .navbar .navbar-text{padding:9px 10px 11px;line-height:19px;color:#ffffff;} .navbar .navbar-search .search-query{margin-bottom:3px;border:1px solid #97310e;} -.navbar .nav-collapse.collapse .nav li>a{color:#ffffff;border-left:0px solid #dd4814;border-right:0px solid #dd4814;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.3);background-image:none;} -.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:0px solid #dd4814;border-bottom:0px solid #dd4814;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.navbar .nav-collapse.collapse .nav-header{color:#f5f5f5;} -.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-right:1px solid #C03D14;border-left:1px solid #E6633A;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#ffffff;border-left:0px solid #dd4814;border-right:0px solid #dd4814;}.navbar .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.3) !important;background-image:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:0px solid #dd4814;border-bottom:0px solid #dd4814;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .nav-collapse .nav-header{color:#f5f5f5;}}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-right:1px solid #C03D14;border-left:1px solid #E6633A;} .btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#e86537;background-image:-moz-linear-gradient(top, #ef784e, #dd4814);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ef784e), to(#dd4814));background-image:-webkit-linear-gradient(top, #ef784e, #dd4814);background-image:-o-linear-gradient(top, #ef784e, #dd4814);background-image:linear-gradient(to bottom, #ef784e, #dd4814);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffef784e', endColorstr='#ffdd4814', GradientType=0);border-color:#dd4814 #dd4814 #97310e;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#dd4814;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#dd4814;*background-color:#c64012;} .btn-primary:active,.btn-primary.active{background-color:#ae3910 \9;} .btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#f3c768;background-image:-moz-linear-gradient(top, #f5d185, #efb73e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5d185), to(#efb73e));background-image:-webkit-linear-gradient(top, #f5d185, #efb73e);background-image:-o-linear-gradient(top, #f5d185, #efb73e);background-image:linear-gradient(to bottom, #f5d185, #efb73e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5d185', endColorstr='#ffefb73e', GradientType=0);border-color:#efb73e #efb73e #cf9311;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#efb73e;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#efb73e;*background-color:#edae26;} diff --git a/united/bootswatch.less b/united/bootswatch.less index f2d20b6e..1ab51ccf 100755 --- a/united/bootswatch.less +++ b/united/bootswatch.less @@ -45,8 +45,11 @@ margin-bottom: 3px; border: 1px solid darken(@navbarBackground, 15%); } +} + +@media (max-width: @navbarCollapseWidth) { - .nav-collapse.collapse { + .navbar .nav-collapse { .nav li > a { color: @white; @@ -54,7 +57,7 @@ border-right: 0px solid @orange; &:hover { - background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(0, 0, 0, 0.3) !important; background-image: none; } } |