diff options
33 files changed, 118 insertions, 136 deletions
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css index 754203da..b11c0dce 100644 --- a/amelia/bootstrap.css +++ b/amelia/bootstrap.css @@ -5241,9 +5241,9 @@ hr { } } div.subnav { - background-color: rgba(42, 99, 105, 0.9); - background-image: none; - border: 0px solid transparent; + margin: 0 1px; + background: rgba(42, 99, 105, 0.9) none; + border: none; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; @@ -5251,10 +5251,6 @@ div.subnav { -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; @@ -5266,27 +5262,26 @@ div.subnav .nav > li:first-child > a:hover { border-radius: 0; } div.subnav .nav > .active > a { - background-color: transparent; + background-color: rgba(255, 255, 255, 0.4); border-color: transparent; color: rgba(255, 255, 255, 0.9); -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } -div.subnav .nav > .active > a:hover, div.subnav .nav > li > a:hover, -div.subnav .nav > .active > a, div.subnav .nav > .active > a:hover { border-right-color: transparent; background-color: rgba(255, 255, 255, 0.4); color: rgba(255, 255, 255, 0.9); } -div.subnav .nav > li:first-child > a:hover { - border-left-color: rgba(255, 255, 255, 0.4); - border-left-width: 1px; +div.subnav .nav > li.open > a { + border-color: transparent; + background-color: rgba(255, 255, 255, 0.4); } div.subnav-fixed { - top: 50px; + top: 51px; + margin: 0; } .nav-tabs li.open > .dropdown-toggle, .nav-pills li.open > .dropdown-toggle { diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css index e4bccabe..a0e0281f 100644 --- a/amelia/bootstrap.min.css +++ b/amelia/bootstrap.min.css @@ -870,13 +870,12 @@ hr{border-bottom:1px solid rgba(255, 255, 255, 0.3);} .navbar .navbar-text{margin:17px 15px 14px;line-height:20px;} .navbar .btn,.navbar .btn-group{padding:4px;} .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;} -@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;} +@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{margin:0 1px;background:rgba(42, 99, 105, 0.9) none;border:none;-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>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;} -div.subnav .nav>.active>a:hover,div.subnav .nav>li>a:hover,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{border-right-color:transparent;background-color:rgba(255, 255, 255, 0.4);color:rgba(255, 255, 255, 0.9);} -div.subnav .nav>li:first-child>a:hover{border-left-color:rgba(255, 255, 255, 0.4);border-left-width:1px;} -div.subnav-fixed{top:50px;} +div.subnav .nav>.active>a{background-color:rgba(255, 255, 255, 0.4);border-color:transparent;color:rgba(255, 255, 255, 0.9);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +div.subnav .nav>li>a:hover,div.subnav .nav>.active>a:hover{border-right-color:transparent;background-color:rgba(255, 255, 255, 0.4);color:rgba(255, 255, 255, 0.9);} +div.subnav .nav>li.open>a{border-color:transparent;background-color:rgba(255, 255, 255, 0.4);} +div.subnav-fixed{top:51px;margin:0;} .nav-tabs li.open>.dropdown-toggle,.nav-pills li.open>.dropdown-toggle{background-color:#8AD5DC;color:#e8d069;border-color:transparent;} .nav-tabs,.nav-pills{border-color:transparent;}.nav-tabs li>a,.nav-pills li>a{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:0;-moz-box-shadow:0;box-shadow:0;} .nav-tabs li.active>a,.nav-pills li.active>a,.nav-tabs li.active>a:hover,.nav-pills li.active>a:hover{color:rgba(255, 255, 255, 0.9);} diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less index 4e245ab9..679fa49f 100755 --- a/amelia/bootswatch.less +++ b/amelia/bootswatch.less @@ -160,17 +160,12 @@ hr { div.subnav { - background-color: rgba(42, 99, 105, 0.9); - background-image: none; - border: 0px solid transparent; + margin: 0 1px; + background: rgba(42, 99, 105, 0.9) none; + border: none; .border-radius(0); .box-shadow(none); - .nav > li.open > a { - border-color: transparent; - background-color: rgba(255, 255, 255, 0.4); - } - .nav > li > a { color: @textColor; border-color: transparent; @@ -182,28 +177,27 @@ div.subnav { } .nav > .active > a { - background-color: transparent; + background-color: rgba(255, 255, 255, 0.4); border-color: transparent; color: @textColor; .box-shadow(none); } - .nav > .active > a:hover, .nav > li > a:hover, - .nav > .active > a, .nav > .active > a:hover, { border-right-color: transparent; background-color: rgba(255, 255, 255, 0.4); color: @textColor; } - .nav > li:first-child > a:hover { - border-left-color: rgba(255, 255, 255, 0.4); - border-left-width: 1px; + .nav > li.open > a { + border-color: transparent; + background-color: rgba(255, 255, 255, 0.4); } &-fixed { - top: 50px; + top: @navbarHeight + 1; + margin: 0; } } diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css index 285c05a8..713f3dbd 100644 --- a/cerulean/bootstrap.css +++ b/cerulean/bootstrap.css @@ -5187,7 +5187,7 @@ div.subnav { text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2); } div.subnav-fixed { - top: 50px; + top: 51px; } .btn { background-color: #ffffff; diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css index 5dc0c959..cb1d0fc7 100644 --- a/cerulean/bootstrap.min.css +++ b/cerulean/bootstrap.min.css @@ -858,7 +858,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .navbar .search-query{border:1px solid #178acc;line-height:normal;} .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-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:#ffffff;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.1);} .navbar-inverse .nav-collapse .nav .active>a,.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:rgba(0, 0, 0, 0.1) !important;}}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:#ffffff;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.1);} .navbar-inverse .nav-collapse .nav .active>a,.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:rgba(0, 0, 0, 0.1) !important;}}div.subnav{font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(255, 255, 255, 0.2);}div.subnav-fixed{top:51px;} .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 5%, #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 3c353e98..32a119c0 100755 --- a/cerulean/bootswatch.less +++ b/cerulean/bootswatch.less @@ -114,7 +114,7 @@ div.subnav { text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2); &-fixed { - top: @navbarHeight; + top: @navbarHeight + 1; } } diff --git a/cosmo/bootstrap.css b/cosmo/bootstrap.css index 79686ee8..c7e283f3 100644 --- a/cosmo/bootstrap.css +++ b/cosmo/bootstrap.css @@ -5223,8 +5223,8 @@ a.text-success:hover { color: #080808; } div.subnav { - background-color: #dfdfdf; - background-image: none; + margin: 0 1px; + background: #dfdfdf none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; @@ -5249,7 +5249,8 @@ div.subnav .nav > .active > a:hover { box-shadow: none; } div.subnav-fixed { - top: 50px; + top: 51px; + margin: 0; } .nav .open .dropdown-toggle, .nav > li.dropdown.open.active > a:hover { diff --git a/cosmo/bootstrap.min.css b/cosmo/bootstrap.min.css index 0402ee5a..aee426d5 100644 --- a/cosmo/bootstrap.min.css +++ b/cosmo/bootstrap.min.css @@ -876,10 +876,10 @@ a.text-success:hover{color:#2f8912;} .navbar-inverse .brand,.navbar-inverse .nav>li>a{text-shadow:none;} .navbar-inverse .brand:hover,.navbar-inverse .nav>.active>a,.navbar-inverse .nav>.active>a:hover,.navbar-inverse .nav>.active>a:focus{background-color:rgba(0, 0, 0, 0.05);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#ffffff;} .navbar-inverse .navbar-search .search-query{color:#080808;} -div.subnav{background-color:#dfdfdf;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav .nav{background-color:transparent;} +div.subnav{margin:0 1px;background:#dfdfdf none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav .nav{background-color:transparent;} div.subnav .nav>li>a{border-color:transparent;} div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{border-color:transparent;background-color:#000000;color:#ffffff;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -div.subnav-fixed{top:50px;} +div.subnav-fixed{top:51px;margin:0;} .nav .open .dropdown-toggle,.nav >li.dropdown.open.active>a:hover{color:#007fff;} .nav-tabs >li>a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .nav-tabs.nav-stacked >li>a:hover{background-color:#007fff;color:#ffffff;} diff --git a/cosmo/bootswatch.less b/cosmo/bootswatch.less index 4681c47f..fa476050 100644 --- a/cosmo/bootswatch.less +++ b/cosmo/bootswatch.less @@ -126,8 +126,8 @@ a.text-success:hover { color: darken(@green, 10%); } div.subnav { - background-color: @grayLight; - background-image: none; + margin: 0 1px; + background: @grayLight none; .box-shadow(none); border: none; .border-radius(0); @@ -145,12 +145,12 @@ div.subnav { border-color: transparent; background-color: @black; color: @white; - // border-left-width: 2px; .box-shadow(none); } &-fixed { - top: @navbarHeight; + top: @navbarHeight + 1; + margin: 0; } } @@ -163,7 +163,6 @@ div.subnav { & > li.dropdown.open.active > a:hover { color: @blue; } - } .nav-tabs { diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css index 6459cb4c..ae6b8875 100644 --- a/cyborg/bootstrap.css +++ b/cyborg/bootstrap.css @@ -5262,14 +5262,12 @@ hr { } } div.subnav { + margin: 0 1px; background-color: #020202; background-image: none; border: none; border-bottom: 1px solid #222222; } -div.subnav.subnav-fixed { - top: 50px; -} div.subnav .nav > li > a, div.subnav .nav > li:first-child > a, div.subnav .nav > li:first-child > a:hover { @@ -5291,6 +5289,10 @@ div.subnav .nav > li:first-child > a:hover { div.subnav .nav li.nav-header { text-shadow: none; } +div.subnav-fixed { + top: 50px; + margin: 0; +} .nav-tabs { border-bottom: 1px solid #222222; } diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css index 8f0b8acf..722bc772 100644 --- a/cyborg/bootstrap.min.css +++ b/cyborg/bootstrap.min.css @@ -869,10 +869,10 @@ hr{border-bottom:none;} .navbar .search-query,.navbar .search-query:focus,.navbar .search-query.focused{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;background-color:#222222;line-height:normal;color:#adafae;text-shadow:none;}.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;} -@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{background-color:#020202;background-image:none;border:none;border-bottom:1px solid #222222;}div.subnav.subnav-fixed{top:50px;} -div.subnav .nav>li>a,div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{padding:11px 12px;border:none;background-color:#020202;color:#adafae;} +@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{margin:0 1px;background-color:#020202;background-image:none;border:none;border-bottom:1px solid #222222;}div.subnav .nav>li>a,div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{padding:11px 12px;border:none;background-color:#020202;color:#adafae;} div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover,div.subnav .nav>li:first-child>a:hover{padding:11px 12px;background:transparent;border:none;border-bottom:1px solid #33b5e5;color:#ffffff;} div.subnav .nav li.nav-header{text-shadow:none;} +div.subnav-fixed{top:50px;margin:0;} .nav-tabs{border-bottom:1px solid #222222;}.nav-tabs li>a:hover,.nav-tabs li.active>a,.nav-tabs li.active>a:hover{border-color:transparent;background-color:#33b5e5;color:#ffffff;} .nav-tabs .open .dropdown-toggle{background-color:#060606;border-color:transparent;} .nav-pills li>a:hover{background-color:#33b5e5;color:#ffffff;} diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less index b488c30e..a9accc44 100755 --- a/cyborg/bootswatch.less +++ b/cyborg/bootswatch.less @@ -165,16 +165,13 @@ hr { } div.subnav { + + margin: 0 1px; background-color: @grayDarker; background-image: none; border: none; border-bottom: 1px solid @grayDark; - - &.subnav-fixed { - top: @navbarHeight; - } - .nav > li > a, .nav > li:first-child > a, .nav > li:first-child > a:hover { @@ -198,6 +195,14 @@ div.subnav { .nav li.nav-header { text-shadow: none; } + + + + + &-fixed { + top: @navbarHeight; + margin: 0; + } } // NAV diff --git a/journal/bootstrap.css b/journal/bootstrap.css index ba5b2af2..6e43fccd 100644 --- a/journal/bootstrap.css +++ b/journal/bootstrap.css @@ -5277,9 +5277,9 @@ hr { } } div.subnav { + margin: 0 1px; height: 54px; - background-color: #ffffff; - background-image: none; + background: #ffffff none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; @@ -5291,7 +5291,8 @@ div.subnav { border-radius: 0; } div.subnav.subnav-fixed { - top: 60px; + top: 61px; + margin: 0; } div.subnav .nav > li > a, div.subnav .nav > li:first-child > a, diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css index 3f5c3cdd..dca81edc 100644 --- a/journal/bootstrap.min.css +++ b/journal/bootstrap.min.css @@ -873,7 +873,7 @@ hr{border-bottom:1px solid #eeeeee;} .navbar .navbar-search .search-query,.navbar .navbar-search .search-query:hover{border:2px solid #eeeeee;color:#777777;}.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;} -@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;} +@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{margin:0 1px;height:54px;background:#ffffff 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:61px;margin:0;} 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;} diff --git a/journal/bootswatch.less b/journal/bootswatch.less index 0f6a01b1..676d67e4 100755 --- a/journal/bootswatch.less +++ b/journal/bootswatch.less @@ -171,9 +171,9 @@ hr { div.subnav { + margin: 0 1px; height: 54px; - background-color: @bodyBackground; - background-image: none; + background: @bodyBackground none; .box-shadow(none); border: 2px solid @grayLighter; border-left: none; @@ -181,7 +181,8 @@ div.subnav { .border-radius(0); &.subnav-fixed { - top: @navbarHeight; + top: @navbarHeight + 1; + margin: 0; } .nav > li > a, diff --git a/readable/bootstrap.css b/readable/bootstrap.css index d6eabb0b..47815fe4 100644 --- a/readable/bootstrap.css +++ b/readable/bootstrap.css @@ -5122,7 +5122,7 @@ div.subnav .nav > .active > a:hover { color: #333333; } div.subnav-fixed { - top: 60px; + top: 61px; } .hero-unit h1, .hero-unit h2, diff --git a/readable/bootstrap.min.css b/readable/bootstrap.min.css index 6b938ed9..a01f7085 100644 --- a/readable/bootstrap.min.css +++ b/readable/bootstrap.min.css @@ -853,7 +853,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .invisible{visibility:hidden;} .affix{position:fixed;} div.subnav .nav>li>a,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{color:#333333;} -div.subnav-fixed{top:60px;} +div.subnav-fixed{top:61px;} .hero-unit h1,.hero-unit h2,.hero-unit h3,.hero-unit h4,.hero-unit h5,.hero-unit h6{margin:13px 0;} .pull-right{float:right;} .pull-left{float:left;} diff --git a/readable/bootswatch.less b/readable/bootswatch.less index 2d220dad..9f5bbc74 100644 --- a/readable/bootswatch.less +++ b/readable/bootswatch.less @@ -23,7 +23,7 @@ div.subnav { } &-fixed { - top: @navbarHeight; + top: @navbarHeight + 1; } } diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index 08393099..e417a6cc 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -5210,6 +5210,7 @@ div.subnav { font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; } div.subnav.subnav-fixed { + top: 41px; -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); diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css index d2289cd6..3062bc1a 100644 --- a/simplex/bootstrap.min.css +++ b/simplex/bootstrap.min.css @@ -863,7 +863,7 @@ hr{border-bottom:none;} .navbar .dropdown-menu a{font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;} .navbar-inverse .navbar-inner{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar-inverse .brand:hover{color:#ffffff;} -@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);} +@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{top:41px;-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;border-left-color:transparent;border-right-color:transparent;color:#555555;font-weight:bold;}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;} .nav .nav-header{font-size:13px;font-weight:normal;text-transform:none;} diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index fef77ddf..62e8136f 100755 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -137,6 +137,7 @@ div.subnav { font-family: @headingsFontFamily; &.subnav-fixed { + top: @navbarHeight + 1; .box-shadow(inset 0 5px #fff~"," @boxShadow); } diff --git a/slate/bootstrap.css b/slate/bootstrap.css index 481dbbe2..b3374748 100644 --- a/slate/bootstrap.css +++ b/slate/bootstrap.css @@ -5253,6 +5253,7 @@ legend, } } div.subnav { + margin: 0 1px; 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); @@ -5300,10 +5301,6 @@ 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; -} div.subnav .nav > li.active:last-child > a, div.subnav .nav > li:last-child > a:hover { border-right: 1px solid #2e3134; @@ -5313,10 +5310,16 @@ div.subnav .open .dropdown-toggle { border-left: 1px solid #52575c; } div.subnav.subnav-fixed { + top: 40px; + margin: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } +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; +} .nav .nav-header { text-shadow: none; } diff --git a/slate/bootstrap.min.css b/slate/bootstrap.min.css index fdc23c59..0d5ad5af 100644 --- a/slate/bootstrap.min.css +++ b/slate/bootstrap.min.css @@ -866,13 +866,12 @@ hr,legend,.page-header{border-top:none;border-bottom:1px solid #1c1e22;backgroun .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 70%, #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);} -@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:#7a8288;} .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 70%, #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:#7a8288;} .navbar-inverse .nav-collapse .nav li>a:hover,.navbar-inverse .nav-collapse .nav .active>a:hover{background-color:#272b30 !important;}}div.subnav{margin:0 1px;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 70%, #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;} div.subnav .nav>li.active:last-child>a,div.subnav .nav>li:last-child>a:hover{border-right:1px solid #2e3134;} div.subnav .open .dropdown-toggle{border-right:1px solid #2e3134;border-left:1px solid #52575c;} -div.subnav.subnav-fixed{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +div.subnav.subnav-fixed{top:40px;margin:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}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;} .nav .nav-header{text-shadow:none;} .nav >li>a{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 70%, #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);-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)';border:none;color:#7a8288;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);} .nav li.active>a,.nav li.active>a:hover{background-color:transparent;border:none;color:#ffffff;} diff --git a/slate/bootswatch.less b/slate/bootswatch.less index 0f3b73d0..9f608630 100755 --- a/slate/bootswatch.less +++ b/slate/bootswatch.less @@ -144,6 +144,7 @@ hr, legend, .page-header { div.subnav { + margin: 0 1px; #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)'); @@ -176,11 +177,6 @@ div.subnav { border-left: 1px solid transparent; } - &.subnav-fixed .nav > li.active:first-child > a, - &.subnav-fixed .nav > li:first-child > a:hover { - border-left: 1px solid darken(@gray, 15%); - } - .nav > li.active:last-child > a, .nav > li:last-child > a:hover { border-right: 1px solid darken(@gray, 15%); @@ -192,7 +188,14 @@ div.subnav { } &.subnav-fixed { + top: @navbarHeight; + margin: 0; .box-shadow(none); + + .nav > li.active:first-child > a, + .nav > li:first-child > a:hover { + border-left: 1px solid darken(@gray, 15%); + } } } diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index f8652809..48dba54b 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -5238,6 +5238,9 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle { div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { color: #0099dd; } +div.subnav-fixed { + top: 41px; +} .nav > li.dropdown > .dropdown-toggle .caret, .nav > li.dropdown.active > .dropdown-toggle .caret, .nav > li.dropdown.open > .dropdown-toggle .caret, diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css index e9f5d3eb..91536089 100644 --- a/spacelab/bootstrap.min.css +++ b/spacelab/bootstrap.min.css @@ -870,6 +870,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} div.subnav .nav>li.active>a{color:#666666;}div.subnav .nav>li.active>a:hover{color:#666666;} 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:#666666;}div.subnav .nav>li.dropdown.open>.dropdown-toggle:hover{color:#0099dd;} +div.subnav-fixed{top:41px;} .nav>li.dropdown>.dropdown-toggle .caret,.nav>li.dropdown.active>.dropdown-toggle .caret,.nav>li.dropdown.open>.dropdown-toggle .caret,.nav>li.dropdown.open.active>.dropdown-toggle .caret{border-top:4px solid #666666;border-top-color:#666666;opacity:1;} .nav>li.dropdown>.dropdown-toggle:hover .caret,.nav>li.dropdown.active>.dropdown-toggle:hover .caret,.nav>li.dropdown.open>.dropdown-toggle:hover .caret,.nav>li.dropdown.open.active>.dropdown-toggle:hover .caret{border-top:4px solid #0099dd;border-top-color:#0099dd;} .control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#e29235;} diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index 62722ce7..dbd0b0e9 100755 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -150,6 +150,10 @@ div.subnav { color: @linkColor; } } + + &-fixed { + top: @navbarHeight + 1; + } } // NAV diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css index 00b8e37b..73e165c3 100644 --- a/spruce/bootstrap.css +++ b/spruce/bootstrap.css @@ -5251,8 +5251,7 @@ blockquote small { } } div.subnav { - background-color: #015b4e; - background-image: none; + background: #015b4e none; border-color: transparent; } div.subnav .nav > li > a { diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css index cb2d677f..2a715181 100644 --- a/spruce/bootstrap.min.css +++ b/spruce/bootstrap.min.css @@ -873,7 +873,7 @@ blockquote small{color:#013435;} .navbar-inverse .dropdown-menu{background-color:#cbcbcb;}.navbar-inverse .dropdown-menu li>a{color:#333333;}.navbar-inverse .dropdown-menu li>a:hover{background-color:#dddddd;} .navbar-inverse .dropdown-menu .divider{border-bottom:1px solid rgba(0, 0, 0, 0.2);} .navbar-inverse .dropdown-menu .nav-header{color:#555555;} -@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#ffffff;}.navbar .nav-collapse .nav li>a:hover{background-color:#002425;} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.06) !important;} .nav-collapse .navbar-form,.nav-collapse .navbar-search{border:none !important;-webkit-box-shadow:none !important;-moz-box-shadow:none !important;box-shadow:none !important;}}div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;}div.subnav .nav>li>a{padding:12px 12px 10px;border-color:transparent;background-color:transparent;font-family:'Crete Round',serif;font-weight:normal;color:#ffffff;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#ffffff;}.navbar .nav-collapse .nav li>a:hover{background-color:#002425;} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.06) !important;} .nav-collapse .navbar-form,.nav-collapse .navbar-search{border:none !important;-webkit-box-shadow:none !important;-moz-box-shadow:none !important;box-shadow:none !important;}}div.subnav{background:#015b4e none;border-color:transparent;}div.subnav .nav>li>a{padding:12px 12px 10px;border-color:transparent;background-color:transparent;font-family:'Crete Round',serif;font-weight:normal;color:#ffffff;} div.subnav .nav>li>a:hover,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover,div.subnav .dropdown.open .dropdown-toggle,div.subnav .dropdown.open.active .dropdown-toggle:hover{background-color:#002425;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-color:transparent;color:#ffffff;} div.subnav.subnav-fixed{top:55px;} .nav .nav-header{color:#333333;} diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less index 10b0d47e..5ba57abb 100755 --- a/spruce/bootswatch.less +++ b/spruce/bootswatch.less @@ -186,8 +186,7 @@ blockquote { div.subnav { - background-color: @green; - background-image: none; + background: @green none; border-color: transparent; .nav > li > a { diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css index 68bf950b..b09ad44d 100644 --- a/superhero/bootstrap.css +++ b/superhero/bootstrap.css @@ -5258,53 +5258,40 @@ blockquote.pull-right { } } div.subnav { - background-color: #45515f; - background-image: none; + margin: 0 1px; + background: #45515f none; border: none; } div.subnav .nav > li > a, div.subnav .nav > li.active > a { - border-left: none; - border-right: none; + border-color: transparent; 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; + border-color: transparent; } div.subnav .nav > li.active > a, div.subnav .nav > li.active > a:hover { - color: #ffffff; - background-color: #e36b23; - background-image: none; + background: #e36b23 none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; + color: #ffffff; } div.subnav.subnav-fixed { - top: 70px; + top: 71px; + margin: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } div.subnav.subnav-fixed .nav > li > a, -div.subnav.subnav-fixed .nav > li.active > a, div.subnav.subnav-fixed .nav > li > a:hover, +div.subnav.subnav-fixed .nav > li.active > a, div.subnav.subnav-fixed .nav > li.active > a:hover { border-color: transparent; - padding-left: 12px; - padding-right: 12px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css index 1f2e41b1..3507c680 100644 --- a/superhero/bootstrap.min.css +++ b/superhero/bootstrap.min.css @@ -874,12 +874,10 @@ 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;} -@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;} -div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{color:#ffffff;background-color:#e36b23;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -div.subnav.subnav-fixed{top:70px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}div.subnav.subnav-fixed .nav>li>a,div.subnav.subnav-fixed .nav>li.active>a,div.subnav.subnav-fixed .nav>li>a:hover,div.subnav.subnav-fixed .nav>li.active>a:hover{border-color:transparent;padding-left:12px;padding-right:12px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +@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{margin:0 1px;background:#45515f none;border:none;}div.subnav .nav>li>a,div.subnav .nav>li.active>a{border-color:transparent;color:#ece9d7;} +div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover{background-color:#5a6a7d;border-color:transparent;} +div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{background:#e36b23 none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#ffffff;} +div.subnav.subnav-fixed{top:71px;margin:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}div.subnav.subnav-fixed .nav>li>a,div.subnav.subnav-fixed .nav>li>a:hover,div.subnav.subnav-fixed .nav>li.active>a,div.subnav.subnav-fixed .nav>li.active>a:hover{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} div.subnav.subnav-fixed .nav>li>a:hover,div.subnav.subnav-fixed .nav>li.active>a:hover{color:#ffffff;} div.subnav .nav>.active>a .caret,div.subnav .nav>.active>a:hover .caret{border-top-color:#ece9d7;} .nav .nav-header{color:#ece9d7;text-shadow:none;} diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less index c6dffca1..5c54200e 100755 --- a/superhero/bootswatch.less +++ b/superhero/bootswatch.less @@ -169,52 +169,39 @@ blockquote.pull-right { } div.subnav { - background-color: @blue; - background-image: none; + margin: 0 1px; + background: @blue none; border: none; .nav > li > a, .nav > li.active > a { - border-left: none; - border-right: none; + border-color: transparent; color: @textColor; } .nav > li > a:hover, .nav > li.active > a:hover { background-color: lighten(@blue, 10%); - } - - .nav > li + li > a { - border-top: 0px solid transparent; - } - - .nav > li:first-child > a, - .nav > li:first-child > a:hover, - .nav > li.active:first-child > a, - .nav > li.active:first-child > a:hover { - .border-radius(4px 0 0 4px); + border-color: transparent; } .nav > li.active > a, .nav > li.active > a:hover { - color: @white; - background-color: @orange; - background-image: none; + background: @orange none; .box-shadow(none); + color: @white; } &.subnav-fixed { - top: 70px; + top: @navbarHeight + 1; + margin: 0; .box-shadow(none); .nav > li > a, - .nav > li.active > a, .nav > li > a:hover, + .nav > li.active > a, .nav > li.active > a:hover { border-color: transparent; - padding-left: 12px; - padding-right: 12px; .border-radius(0); } |