Commit 078ff71c authored by Thomas Park's avatar Thomas Park
Browse files

fixes #69, subnav-fixed position tweaks

parent c889a189
...@@ -5241,9 +5241,9 @@ hr { ...@@ -5241,9 +5241,9 @@ hr {
} }
} }
div.subnav { div.subnav {
background-color: rgba(42, 99, 105, 0.9); margin: 0 1px;
background-image: none; background: rgba(42, 99, 105, 0.9) none;
border: 0px solid transparent; border: none;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
...@@ -5251,10 +5251,6 @@ div.subnav { ...@@ -5251,10 +5251,6 @@ div.subnav {
-moz-box-shadow: none; -moz-box-shadow: none;
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 { div.subnav .nav > li > a {
color: rgba(255, 255, 255, 0.9); color: rgba(255, 255, 255, 0.9);
border-color: transparent; border-color: transparent;
...@@ -5266,27 +5262,26 @@ div.subnav .nav > li:first-child > a:hover { ...@@ -5266,27 +5262,26 @@ div.subnav .nav > li:first-child > a:hover {
border-radius: 0; border-radius: 0;
} }
div.subnav .nav > .active > a { div.subnav .nav > .active > a {
background-color: transparent; background-color: rgba(255, 255, 255, 0.4);
border-color: transparent; border-color: transparent;
color: rgba(255, 255, 255, 0.9); color: rgba(255, 255, 255, 0.9);
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
div.subnav .nav > .active > a:hover,
div.subnav .nav > li > a:hover, div.subnav .nav > li > a:hover,
div.subnav .nav > .active > a,
div.subnav .nav > .active > a:hover { div.subnav .nav > .active > a:hover {
border-right-color: transparent; border-right-color: transparent;
background-color: rgba(255, 255, 255, 0.4); background-color: rgba(255, 255, 255, 0.4);
color: rgba(255, 255, 255, 0.9); color: rgba(255, 255, 255, 0.9);
} }
div.subnav .nav > li:first-child > a:hover { div.subnav .nav > li.open > a {
border-left-color: rgba(255, 255, 255, 0.4); border-color: transparent;
border-left-width: 1px; background-color: rgba(255, 255, 255, 0.4);
} }
div.subnav-fixed { div.subnav-fixed {
top: 50px; top: 51px;
margin: 0;
} }
.nav-tabs li.open > .dropdown-toggle, .nav-tabs li.open > .dropdown-toggle,
.nav-pills li.open > .dropdown-toggle { .nav-pills li.open > .dropdown-toggle {
......
...@@ -870,13 +870,12 @@ hr{border-bottom:1px solid rgba(255, 255, 255, 0.3);} ...@@ -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 .navbar-text{margin:17px 15px 14px;line-height:20px;}
.navbar .btn,.navbar .btn-group{padding:4px;} .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;} .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);} @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>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>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{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>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: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;} 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 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,.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);} .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);}
......
...@@ -160,17 +160,12 @@ hr { ...@@ -160,17 +160,12 @@ hr {
div.subnav { div.subnav {
background-color: rgba(42, 99, 105, 0.9); margin: 0 1px;
background-image: none; background: rgba(42, 99, 105, 0.9) none;
border: 0px solid transparent; border: none;
.border-radius(0); .border-radius(0);
.box-shadow(none); .box-shadow(none);
.nav > li.open > a {
border-color: transparent;
background-color: rgba(255, 255, 255, 0.4);
}
.nav > li > a { .nav > li > a {
color: @textColor; color: @textColor;
border-color: transparent; border-color: transparent;
...@@ -182,28 +177,27 @@ div.subnav { ...@@ -182,28 +177,27 @@ div.subnav {
} }
.nav > .active > a { .nav > .active > a {
background-color: transparent; background-color: rgba(255, 255, 255, 0.4);
border-color: transparent; border-color: transparent;
color: @textColor; color: @textColor;
.box-shadow(none); .box-shadow(none);
} }
.nav > .active > a:hover,
.nav > li > a:hover, .nav > li > a:hover,
.nav > .active > a,
.nav > .active > a:hover, { .nav > .active > a:hover, {
border-right-color: transparent; border-right-color: transparent;
background-color: rgba(255, 255, 255, 0.4); background-color: rgba(255, 255, 255, 0.4);
color: @textColor; color: @textColor;
} }
.nav > li:first-child > a:hover { .nav > li.open > a {
border-left-color: rgba(255, 255, 255, 0.4); border-color: transparent;
border-left-width: 1px; background-color: rgba(255, 255, 255, 0.4);
} }
&-fixed { &-fixed {
top: 50px; top: @navbarHeight + 1;
margin: 0;
} }
} }
......
...@@ -5187,7 +5187,7 @@ div.subnav { ...@@ -5187,7 +5187,7 @@ div.subnav {
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2); text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2);
} }
div.subnav-fixed { div.subnav-fixed {
top: 50px; top: 51px;
} }
.btn { .btn {
background-color: #ffffff; background-color: #ffffff;
......
...@@ -858,7 +858,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} ...@@ -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 .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 .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;} .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{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{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;} .btn-primary:active,.btn-primary.active{background-color:#178acc \9;}
......
...@@ -114,7 +114,7 @@ div.subnav { ...@@ -114,7 +114,7 @@ div.subnav {
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2); text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2);
&-fixed { &-fixed {
top: @navbarHeight; top: @navbarHeight + 1;
} }
} }
......
...@@ -5223,8 +5223,8 @@ a.text-success:hover { ...@@ -5223,8 +5223,8 @@ a.text-success:hover {
color: #080808; color: #080808;
} }
div.subnav { div.subnav {
background-color: #dfdfdf; margin: 0 1px;
background-image: none; background: #dfdfdf none;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
...@@ -5249,7 +5249,8 @@ div.subnav .nav > .active > a:hover { ...@@ -5249,7 +5249,8 @@ div.subnav .nav > .active > a:hover {
box-shadow: none; box-shadow: none;
} }
div.subnav-fixed { div.subnav-fixed {
top: 50px; top: 51px;
margin: 0;
} }
.nav .open .dropdown-toggle, .nav .open .dropdown-toggle,
.nav > li.dropdown.open.active > a:hover { .nav > li.dropdown.open.active > a:hover {
......
...@@ -876,10 +876,10 @@ a.text-success:hover{color:#2f8912;} ...@@ -876,10 +876,10 @@ a.text-success:hover{color:#2f8912;}
.navbar-inverse .brand,.navbar-inverse .nav>li>a{text-shadow:none;} .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 .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;} .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>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 .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 .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 >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;} .nav-tabs.nav-stacked >li>a:hover{background-color:#007fff;color:#ffffff;}
......
...@@ -126,8 +126,8 @@ a.text-success:hover { color: darken(@green, 10%); } ...@@ -126,8 +126,8 @@ a.text-success:hover { color: darken(@green, 10%); }
div.subnav { div.subnav {
background-color: @grayLight; margin: 0 1px;
background-image: none; background: @grayLight none;
.box-shadow(none); .box-shadow(none);
border: none; border: none;
.border-radius(0); .border-radius(0);
...@@ -145,12 +145,12 @@ div.subnav { ...@@ -145,12 +145,12 @@ div.subnav {
border-color: transparent; border-color: transparent;
background-color: @black; background-color: @black;
color: @white; color: @white;
// border-left-width: 2px;
.box-shadow(none); .box-shadow(none);
} }
&-fixed { &-fixed {
top: @navbarHeight; top: @navbarHeight + 1;
margin: 0;
} }
} }
...@@ -163,7 +163,6 @@ div.subnav { ...@@ -163,7 +163,6 @@ div.subnav {
& > li.dropdown.open.active > a:hover { & > li.dropdown.open.active > a:hover {
color: @blue; color: @blue;
} }
} }
.nav-tabs { .nav-tabs {
......
...@@ -5262,14 +5262,12 @@ hr { ...@@ -5262,14 +5262,12 @@ hr {
} }
} }
div.subnav { div.subnav {
margin: 0 1px;
background-color: #020202; background-color: #020202;
background-image: none; background-image: none;
border: none; border: none;
border-bottom: 1px solid #222222; border-bottom: 1px solid #222222;
} }
div.subnav.subnav-fixed {
top: 50px;
}
div.subnav .nav > li > a, div.subnav .nav > li > a,
div.subnav .nav > li:first-child > a, div.subnav .nav > li:first-child > a,
div.subnav .nav > li:first-child > a:hover { div.subnav .nav > li:first-child > a:hover {
...@@ -5291,6 +5289,10 @@ 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 { div.subnav .nav li.nav-header {
text-shadow: none; text-shadow: none;
} }
div.subnav-fixed {
top: 50px;
margin: 0;
}
.nav-tabs { .nav-tabs {
border-bottom: 1px solid #222222; border-bottom: 1px solid #222222;
} }
......
...@@ -869,10 +869,10 @@ hr{border-bottom:none;} ...@@ -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,.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:-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 .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;} @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,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>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 .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{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-tabs .open .dropdown-toggle{background-color:#060606;border-color:transparent;}
.nav-pills li>a:hover{background-color:#33b5e5;color:#ffffff;} .nav-pills li>a:hover{background-color:#33b5e5;color:#ffffff;}
......
...@@ -165,16 +165,13 @@ hr { ...@@ -165,16 +165,13 @@ hr {
} }
div.subnav { div.subnav {
margin: 0 1px;
background-color: @grayDarker; background-color: @grayDarker;
background-image: none; background-image: none;
border: none; border: none;
border-bottom: 1px solid @grayDark; border-bottom: 1px solid @grayDark;
&.subnav-fixed {
top: @navbarHeight;
}
.nav > li > a, .nav > li > a,
.nav > li:first-child > a, .nav > li:first-child > a,
.nav > li:first-child > a:hover { .nav > li:first-child > a:hover {
...@@ -198,6 +195,14 @@ div.subnav { ...@@ -198,6 +195,14 @@ div.subnav {
.nav li.nav-header { .nav li.nav-header {
text-shadow: none; text-shadow: none;
} }
&-fixed {
top: @navbarHeight;
margin: 0;
}
} }
// NAV // NAV
......
...@@ -5277,9 +5277,9 @@ hr { ...@@ -5277,9 +5277,9 @@ hr {
} }
} }
div.subnav { div.subnav {
margin: 0 1px;
height: 54px; height: 54px;
background-color: #ffffff; background: #ffffff none;
background-image: none;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
...@@ -5291,7 +5291,8 @@ div.subnav { ...@@ -5291,7 +5291,8 @@ div.subnav {
border-radius: 0; border-radius: 0;
} }
div.subnav.subnav-fixed { div.subnav.subnav-fixed {
top: 60px; top: 61px;
margin: 0;
} }
div.subnav .nav > li > a, div.subnav .nav > li > a,
div.subnav .nav > li:first-child > a, div.subnav .nav > li:first-child > a,
......
...@@ -873,7 +873,7 @@ hr{border-bottom:1px solid #eeeeee;} ...@@ -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,.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:-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;} .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 .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>.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;} div.subnav li.dropdown.open .dropdown-toggle,div.subnav li.dropdown.open .dropdown-toggle:hover{background-color:#ffffff;color:#000000;}
......
...@@ -171,9 +171,9 @@ hr { ...@@ -171,9 +171,9 @@ hr {
div.subnav { div.subnav {
margin: 0 1px;
height: 54px; height: 54px;
background-color: @bodyBackground; background: @bodyBackground none;
background-image: none;
.box-shadow(none); .box-shadow(none);
border: 2px solid @grayLighter; border: 2px solid @grayLighter;
border-left: none; border-left: none;
...@@ -181,7 +181,8 @@ div.subnav { ...@@ -181,7 +181,8 @@ div.subnav {
.border-radius(0); .border-radius(0);
&.subnav-fixed { &.subnav-fixed {
top: @navbarHeight; top: @navbarHeight + 1;
margin: 0;
} }
.nav > li > a, .nav > li > a,
......
...@@ -5122,7 +5122,7 @@ div.subnav .nav > .active > a:hover { ...@@ -5122,7 +5122,7 @@ div.subnav .nav > .active > a:hover {
color: #333333; color: #333333;
} }
div.subnav-fixed { div.subnav-fixed {
top: 60px; top: 61px;
} }
.hero-unit h1, .hero-unit h1,
.hero-unit h2, .hero-unit h2,
......
...@@ -853,7 +853,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} ...@@ -853,7 +853,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
.invisible{visibility:hidden;} .invisible{visibility:hidden;}
.affix{position:fixed;} .affix{position:fixed;}
div.subnav .nav>li>a,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{color:#333333;} 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;}