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

fixes #69, subnav-fixed position tweaks

parent c889a189
...@@ -137,6 +137,7 @@ div.subnav { ...@@ -137,6 +137,7 @@ div.subnav {
font-family: @headingsFontFamily; font-family: @headingsFontFamily;
&.subnav-fixed { &.subnav-fixed {
top: @navbarHeight + 1;
.box-shadow(inset 0 5px #fff~"," @boxShadow); .box-shadow(inset 0 5px #fff~"," @boxShadow);
} }
......
...@@ -5253,6 +5253,7 @@ legend, ...@@ -5253,6 +5253,7 @@ legend,
} }
} }
div.subnav { div.subnav {
margin: 0 1px;
background-color: #3a3f44; background-color: #3a3f44;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#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: -webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
...@@ -5300,10 +5301,6 @@ div.subnav .nav > li:first-child > a, ...@@ -5300,10 +5301,6 @@ div.subnav .nav > li:first-child > a,
div.subnav .nav > li:first-child > a:hover { div.subnav .nav > li:first-child > a:hover {
border-left: 1px solid transparent; 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.active:last-child > a,
div.subnav .nav > li:last-child > a:hover { div.subnav .nav > li:last-child > a:hover {
border-right: 1px solid #2e3134; border-right: 1px solid #2e3134;
...@@ -5313,10 +5310,16 @@ div.subnav .open .dropdown-toggle { ...@@ -5313,10 +5310,16 @@ div.subnav .open .dropdown-toggle {
border-left: 1px solid #52575c; border-left: 1px solid #52575c;
} }
div.subnav.subnav-fixed { div.subnav.subnav-fixed {
top: 40px;
margin: 0;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
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 { .nav .nav-header {
text-shadow: none; text-shadow: none;
} }
......
...@@ -866,13 +866,12 @@ hr,legend,.page-header{border-top:none;border-bottom:1px solid #1c1e22;backgroun ...@@ -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 .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{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);} .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.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 .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 .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 .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 .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>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;} .nav li.active>a,.nav li.active>a:hover{background-color:transparent;border:none;color:#ffffff;}
......
...@@ -144,6 +144,7 @@ hr, legend, .page-header { ...@@ -144,6 +144,7 @@ hr, legend, .page-header {
div.subnav { div.subnav {
margin: 0 1px;
#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark); #gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
border: 1px solid transparent; 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)'); .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 { ...@@ -176,11 +177,6 @@ div.subnav {
border-left: 1px solid transparent; 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.active:last-child > a,
.nav > li:last-child > a:hover { .nav > li:last-child > a:hover {
border-right: 1px solid darken(@gray, 15%); border-right: 1px solid darken(@gray, 15%);
...@@ -192,7 +188,14 @@ div.subnav { ...@@ -192,7 +188,14 @@ div.subnav {
} }
&.subnav-fixed { &.subnav-fixed {
top: @navbarHeight;
margin: 0;
.box-shadow(none); .box-shadow(none);
.nav > li.active:first-child > a,
.nav > li:first-child > a:hover {
border-left: 1px solid darken(@gray, 15%);
}
} }
} }
......
...@@ -5238,6 +5238,9 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle { ...@@ -5238,6 +5238,9 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle {
div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover {
color: #0099dd; color: #0099dd;
} }
div.subnav-fixed {
top: 41px;
}
.nav > li.dropdown > .dropdown-toggle .caret, .nav > li.dropdown > .dropdown-toggle .caret,
.nav > li.dropdown.active > .dropdown-toggle .caret, .nav > li.dropdown.active > .dropdown-toggle .caret,
.nav > li.dropdown.open > .dropdown-toggle .caret, .nav > li.dropdown.open > .dropdown-toggle .caret,
......
...@@ -870,6 +870,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} ...@@ -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.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>.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 .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 .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;} .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;} .control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#e29235;}
......
...@@ -150,6 +150,10 @@ div.subnav { ...@@ -150,6 +150,10 @@ div.subnav {
color: @linkColor; color: @linkColor;
} }
} }
&-fixed {
top: @navbarHeight + 1;
}
} }
// NAV // NAV
......
...@@ -5251,8 +5251,7 @@ blockquote small { ...@@ -5251,8 +5251,7 @@ blockquote small {
} }
} }
div.subnav { div.subnav {
background-color: #015b4e; background: #015b4e none;
background-image: none;
border-color: transparent; border-color: transparent;
} }
div.subnav .nav > li > a { div.subnav .nav > li > a {
......
...@@ -873,7 +873,7 @@ blockquote small{color:#013435;} ...@@ -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{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 .divider{border-bottom:1px solid rgba(0, 0, 0, 0.2);}
.navbar-inverse .dropdown-menu .nav-header{color:#555555;} .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 .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;} div.subnav.subnav-fixed{top:55px;}
.nav .nav-header{color:#333333;} .nav .nav-header{color:#333333;}
......
...@@ -186,8 +186,7 @@ blockquote { ...@@ -186,8 +186,7 @@ blockquote {
div.subnav { div.subnav {
background-color: @green; background: @green none;
background-image: none;
border-color: transparent; border-color: transparent;
.nav > li > a { .nav > li > a {
......
...@@ -5258,53 +5258,40 @@ blockquote.pull-right { ...@@ -5258,53 +5258,40 @@ blockquote.pull-right {
} }
} }
div.subnav { div.subnav {
background-color: #45515f; margin: 0 1px;
background-image: none; background: #45515f none;
border: none; border: none;
} }
div.subnav .nav > li > a, div.subnav .nav > li > a,
div.subnav .nav > li.active > a { div.subnav .nav > li.active > a {
border-left: none; border-color: transparent;
border-right: none;
color: #ece9d7; color: #ece9d7;
} }
div.subnav .nav > li > a:hover, div.subnav .nav > li > a:hover,
div.subnav .nav > li.active > a:hover { div.subnav .nav > li.active > a:hover {
background-color: #5a6a7d; background-color: #5a6a7d;
} border-color: transparent;
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,
div.subnav .nav > li.active > a:hover { div.subnav .nav > li.active > a:hover {
color: #ffffff; background: #e36b23 none;
background-color: #e36b23;
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;
color: #ffffff;
} }
div.subnav.subnav-fixed { div.subnav.subnav-fixed {
top: 70px; top: 71px;
margin: 0;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
div.subnav.subnav-fixed .nav > li > a, 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 > a:hover,
div.subnav.subnav-fixed .nav > li.active > a,
div.subnav.subnav-fixed .nav > li.active > a:hover { div.subnav.subnav-fixed .nav > li.active > a:hover {
border-color: transparent; border-color: transparent;
padding-left: 12px;
padding-right: 12px;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
......
...@@ -874,12 +874,10 @@ blockquote.pull-right{border-right:5px solid #45515f;} ...@@ -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 .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 [class^="icon-"],.navbar [class*=" icon-"]{vertical-align:20%;}
.navbar .btn-navbar{background-color:#45515f;border-color:transparent;} .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;} @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;} div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover{background-color:#5a6a7d;border-color:transparent;}
div.subnav .nav>li+li>a{border-top:0px solid 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 .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.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 .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;}
div.subnav.subnav-fixed .nav>li>a:hover,div.subnav.subnav-fixed .nav>li.active>a:hover{color:#ffffff;} 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;} 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;} .nav .nav-header{color:#ece9d7;text-shadow:none;}
......
...@@ -169,52 +169,39 @@ blockquote.pull-right { ...@@ -169,52 +169,39 @@ blockquote.pull-right {
} }
div.subnav { div.subnav {
background-color: @blue; margin: 0 1px;
background-image: none; background: @blue none;
border: none; border: none;
.nav > li > a, .nav > li > a,
.nav > li.active > a { .nav > li.active > a {
border-left: none; border-color: transparent;
border-right: none;
color: @textColor; color: @textColor;
} }
.nav > li > a:hover, .nav > li > a:hover,
.nav > li.active > a:hover { .nav > li.active > a:hover {
background-color: lighten(@blue, 10%); background-color: lighten(@blue, 10%);
} border-color: transparent;
.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);
} }
.nav > li.active > a, .nav > li.active > a,
.nav > li.active > a:hover { .nav > li.active > a:hover {
color: @white; background: @orange none;
background-color: @orange;
background-image: none;
.box-shadow(none); .box-shadow(none);
color: @white;
} }
&.subnav-fixed { &.subnav-fixed {
top: 70px; top: @navbarHeight + 1;
margin: 0;
.box-shadow(none); .box-shadow(none);
.nav > li > a, .nav > li > a,
.nav > li.active > a,
.nav > li > a:hover, .nav > li > a:hover,
.nav > li.active > a,
.nav > li.active > a:hover { .nav > li.active > a:hover {
border-color: transparent; border-color: transparent;
padding-left: 12px;
padding-right: 12px;
.border-radius(0); .border-radius(0);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment