Commit d4e7d3f0 authored by Thomas Park's avatar Thomas Park
Browse files

all: change how nav-collapse is styled to use a media query

parent c47bd572
...@@ -4836,41 +4836,44 @@ hr { ...@@ -4836,41 +4836,44 @@ hr {
.navbar .btn-group { .navbar .btn-group {
padding: 4px; padding: 4px;
} }
.navbar .nav-collapse.collapse .nav li > a {
color: rgba(255, 255, 255, 0.9);
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.navbar .nav-collapse.collapse .nav li > a:hover {
background-color: #d92432;
}
.navbar .nav-collapse.collapse .dropdown-menu li > a:hover,
.navbar .nav-collapse.collapse .dropdown-menu li > a:focus,
.navbar .nav-collapse.collapse .dropdown-submenu:hover > a {
background-image: none;
}
.navbar .nav-collapse.collapse .navbar-form,
.navbar .nav-collapse.collapse .navbar-search {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
border: none;
}
.navbar .nav-collapse.collapse .navbar-search .search-query {
border: 2px solid rgba(255, 255, 255, 0.9);
}
.navbar .nav-collapse.collapse .nav-header {
color: rgba(255, 255, 255, 0.5);
}
.navbar-inverse .dropdown-menu li > a:hover, .navbar-inverse .dropdown-menu li > a:hover,
.navbar-inverse .dropdown-menu li > a:focus, .navbar-inverse .dropdown-menu li > a:focus,
.navbar-inverse .dropdown-submenu:hover > a { .navbar-inverse .dropdown-submenu:hover > a {
background-image: none; background-image: none;
background-color: #debb27; background-color: #debb27;
} }
.navbar-inverse .nav-collapse.collapse .nav li > a:hover { @media (max-width: 979px) {
background-color: #e5c953; .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 { div.subnav {
background-color: rgba(42, 99, 105, 0.9); background-color: rgba(42, 99, 105, 0.9);
......
...@@ -819,14 +819,8 @@ hr{border-bottom:1px solid rgba(255, 255, 255, 0.3);} ...@@ -819,14 +819,8 @@ hr{border-bottom:1px solid rgba(255, 255, 255, 0.3);}
.navbar .navbar-search .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;padding-top:5px;padding-bottom:5px;} .navbar .navbar-search .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;padding-top:5px;padding-bottom:5px;}
.navbar .navbar-text{margin:17px 15px 14px;line-height:20px;} .navbar .navbar-text{margin:17px 15px 14px;line-height:20px;}
.navbar .btn,.navbar .btn-group{padding:4px;} .navbar .btn,.navbar .btn-group{padding:4px;}
.navbar .nav-collapse.collapse .nav li>a{color:rgba(255, 255, 255, 0.9);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#d92432;}
.navbar .nav-collapse.collapse .dropdown-menu li>a:hover,.navbar .nav-collapse.collapse .dropdown-menu li>a:focus,.navbar .nav-collapse.collapse .dropdown-submenu:hover>a{background-image:none;}
.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;}
.navbar .nav-collapse.collapse .navbar-search .search-query{border:2px solid rgba(255, 255, 255, 0.9);}
.navbar .nav-collapse.collapse .nav-header{color:rgba(255, 255, 255, 0.5);}
.navbar-inverse .dropdown-menu li>a:hover,.navbar-inverse .dropdown-menu li>a:focus,.navbar-inverse .dropdown-submenu:hover>a{background-image:none;background-color:#debb27;} .navbar-inverse .dropdown-menu li>a:hover,.navbar-inverse .dropdown-menu li>a:focus,.navbar-inverse .dropdown-submenu:hover>a{background-image:none;background-color:#debb27;}
.navbar-inverse .nav-collapse.collapse .nav li>a:hover{background-color:#e5c953;} @media (max-width:979px){.navbar .nav-collapse .nav li>a{color:rgba(255, 255, 255, 0.9);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.navbar .nav-collapse .nav li>a:hover{background-color:#d92432;} .navbar .nav-collapse .dropdown-menu li>a:hover,.navbar .nav-collapse .dropdown-menu li>a:focus,.navbar .nav-collapse .dropdown-submenu:hover>a{background-image:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;} .navbar .nav-collapse .navbar-search .search-query{border:2px solid rgba(255, 255, 255, 0.9);} .navbar .nav-collapse .nav-header{color:rgba(255, 255, 255, 0.5);} .navbar-inverse .nav-collapse .nav li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#e5c953 !important;}}div.subnav{background-color:rgba(42, 99, 105, 0.9);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{background-color:rgba(42, 99, 105, 0.9);background-image:none;border:0px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}div.subnav .nav>li.open>a{border-color:transparent;background-color:rgba(255, 255, 255, 0.4);}
div.subnav .nav>li>a{color:rgba(255, 255, 255, 0.9);border-color:transparent;} div.subnav .nav>li>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:transparent;border-color:transparent;color:rgba(255, 255, 255, 0.9);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
...@@ -925,8 +919,7 @@ input,textarea,.search-query,.uneditable-input,.input-append input,.input-append ...@@ -925,8 +919,7 @@ input,textarea,.search-query,.uneditable-input,.input-append input,.input-append
.progress-success.progress-striped .bar{background-color:#48ca3b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress-success.progress-striped .bar{background-color:#48ca3b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
.progress-info .bar{background-image:none;background-color:#00bce1;} .progress-info .bar{background-image:none;background-color:#00bce1;}
.progress-info.progress-striped .bar{background-color:#00bce1;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress-info.progress-striped .bar{background-color:#00bce1;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
.modal{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .modal{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.modal-header{background-color:#ad1d28;color:#ffffff;}
.modal-header{background-color:#ad1d28;color:#ffffff;}
.modal-body{color:#444444;}.modal-body h1,.modal-body h2,.modal-body h3,.modal-body h4,.modal-body h5,.modal-body h6,.modal-body legend{color:#ad1d28;} .modal-body{color:#444444;}.modal-body h1,.modal-body h2,.modal-body h3,.modal-body h4,.modal-body h5,.modal-body h6,.modal-body legend{color:#ad1d28;}
.modal-body label,.modal-body .input-file{color:#444444;} .modal-body label,.modal-body .input-file{color:#444444;}
.modal-body .help-block,.modal-body .help-inline{color:#aaaaaa;} .modal-body .help-block,.modal-body .help-inline{color:#aaaaaa;}
......
...@@ -104,9 +104,23 @@ hr { ...@@ -104,9 +104,23 @@ hr {
padding: 4px; padding: 4px;
} }
.nav-collapse.collapse { &-inverse {
.dropdown-menu li > a:hover,
.dropdown-menu li > a:focus,
.dropdown-submenu:hover > a {
background-image: none;
background-color: @yellow;
}
}
}
@media (max-width: @navbarCollapseWidth) {
.navbar .nav-collapse {
.nav li > a { .nav li > a {
color: @textColor; color: @textColor;
.border-radius(0); .border-radius(0);
...@@ -136,20 +150,11 @@ hr { ...@@ -136,20 +150,11 @@ hr {
} }
} }
&-inverse { .navbar-inverse .nav-collapse {
.dropdown-menu li > a:hover, .nav li > a:hover,
.dropdown-menu li > a:focus, .dropdown-menu a:hover {
.dropdown-submenu:hover > a { background-color: lighten(@navbarInverseBackground, 10%) !important;
background-image: none;
background-color: @yellow;
}
.nav-collapse.collapse {
.nav li > a:hover {
background-color: lighten(@navbarInverseBackground, 10%);
}
} }
} }
} }
......
...@@ -4749,20 +4749,18 @@ a.badge:hover { ...@@ -4749,20 +4749,18 @@ a.badge:hover {
.affix { .affix {
position: fixed; position: fixed;
} }
.navbar {
font-family: 'Telex', sans-serif;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
}
.navbar .brand { .navbar .brand {
padding: 16px 20px 14px; padding: 16px 20px 14px;
text-shadow: inherit; font-family: 'Telex', sans-serif;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
} }
.navbar li { .navbar li {
line-height: 20px; line-height: 20px;
} }
.navbar .nav > li > a { .navbar .nav > li > a {
padding: 16px 10px 14px; padding: 16px 10px 14px;
text-shadow: inherit; font-family: 'Telex', sans-serif;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
} }
.navbar .search-query { .navbar .search-query {
border: 1px solid #178acc; border: 1px solid #178acc;
...@@ -4776,45 +4774,47 @@ a.badge:hover { ...@@ -4776,45 +4774,47 @@ a.badge:hover {
color: rgba(0, 0, 0, 0.5); color: rgba(0, 0, 0, 0.5);
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3); text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
} }
.navbar .nav-collapse.collapse .nav li > a {
color: #ffffff;
}
.navbar .nav-collapse.collapse .nav li > a:hover {
background-color: #2B7CAC;
}
.navbar .nav-collapse.collapse .nav .active > a {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
background-color: #2B7CAC;
}
.navbar .nav-collapse.collapse .dropdown-menu li > a:hover,
.navbar .nav-collapse.collapse .dropdown-menu li > a:focus,
.navbar .nav-collapse.collapse .dropdown-submenu:hover > a {
background-image: none;
}
.navbar .nav-collapse.collapse .navbar-form,
.navbar .nav-collapse.collapse .navbar-search {
border: none;
}
.navbar .nav-collapse.collapse .nav-header {
color: #2B7CAC;
}
.navbar-inverse {
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
}
.navbar-inverse .nav-collapse.collapse .nav li > a {
color: #555555;
}
.navbar-inverse .nav-collapse.collapse .nav li > a:hover {
background-color: rgba(0, 0, 0, 0.1);
}
.navbar-inverse .nav-collapse.collapse .nav .active > a {
background-color: rgba(0, 0, 0, 0.1);
}
.navbar-inverse .navbar-search .search-query { .navbar-inverse .navbar-search .search-query {
color: #555555; color: #555555;
} }
@media (max-width: 979px) {
.navbar .nav-collapse .nav li > a {
font-family: 'Telex', sans-serif;
font-weight: normal;
color: #ffffff;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
}
.navbar .nav-collapse .nav li > a:hover {
background-color: #2B7CAC;
}
.navbar .nav-collapse .nav .active > a {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
background-color: #2B7CAC;
}
.navbar .nav-collapse .dropdown-menu li > a:hover,
.navbar .nav-collapse .dropdown-menu li > a:focus,
.navbar .nav-collapse .dropdown-submenu:hover > a {
background-image: none;
}
.navbar .nav-collapse .navbar-form,
.navbar .nav-collapse .navbar-search {
border: none;
}
.navbar .nav-collapse .nav-header {
color: #2B7CAC;
}
.navbar-inverse .nav-collapse .nav li > a {
color: #555555;
}
.navbar-inverse .nav-collapse .nav li > a:hover {
background-color: rgba(0, 0, 0, 0.1);
}
.navbar-inverse .nav-collapse .nav .active > a {
background-color: rgba(0, 0, 0, 0.1);
}
}
div.subnav { div.subnav {
font-family: 'Telex', sans-serif; font-family: 'Telex', sans-serif;
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2); text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2);
......
...@@ -801,21 +801,14 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} ...@@ -801,21 +801,14 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
.show{display:block;} .show{display:block;}
.invisible{visibility:hidden;} .invisible{visibility:hidden;}
.affix{position:fixed;} .affix{position:fixed;}
.navbar{font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(0, 0, 0, 0.2);}.navbar .brand{padding:16px 20px 14px;text-shadow:inherit;} .navbar .brand{padding:16px 20px 14px;font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(0, 0, 0, 0.2);}
.navbar li{line-height:20px;} .navbar li{line-height:20px;}
.navbar .nav>li>a{padding:16px 10px 14px;text-shadow:inherit;} .navbar .nav>li>a{padding:16px 10px 14px;font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(0, 0, 0, 0.2);}
.navbar .search-query{border:1px solid #178acc;} .navbar .search-query{border:1px solid #178acc;}
.navbar .btn-navbar:hover{background-color:#cccccc;} .navbar .btn-navbar:hover{background-color:#cccccc;}
.navbar .navbar-text{padding:19px 10px 18px;line-height:13px;color:rgba(0, 0, 0, 0.5);text-shadow:1px 1px 0 rgba(255, 255, 255, 0.3);} .navbar .navbar-text{padding:19px 10px 18px;line-height:13px;color:rgba(0, 0, 0, 0.5);text-shadow:1px 1px 0 rgba(255, 255, 255, 0.3);}
.navbar .nav-collapse.collapse .nav li>a{color:#ffffff;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#2B7CAC;}
.navbar .nav-collapse.collapse .nav .active>a{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#2B7CAC;}
.navbar .nav-collapse.collapse .dropdown-menu li>a:hover,.navbar .nav-collapse.collapse .dropdown-menu li>a:focus,.navbar .nav-collapse.collapse .dropdown-submenu:hover>a{background-image:none;}
.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border:none;}
.navbar .nav-collapse.collapse .nav-header{color:#2B7CAC;}
.navbar-inverse{text-shadow:1px 1px 0 rgba(255, 255, 255, 0.5);}.navbar-inverse .nav-collapse.collapse .nav li>a{color:#555555;}.navbar-inverse .nav-collapse.collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.1);}
.navbar-inverse .nav-collapse.collapse .nav .active>a{background-color:rgba(0, 0, 0, 0.1);}
.navbar-inverse .navbar-search .search-query{color:#555555;} .navbar-inverse .navbar-search .search-query{color:#555555;}
div.subnav{font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(255, 255, 255, 0.2);}div.subnav-fixed{top:50px;} @media (max-width:979px){.navbar .nav-collapse .nav li>a{font-family:'Telex',sans-serif;font-weight:normal;color:#ffffff;text-shadow:1px 1px 0 rgba(0, 0, 0, 0.2);}.navbar .nav-collapse .nav li>a:hover{background-color:#2B7CAC;} .navbar .nav-collapse .nav .active>a{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#2B7CAC;} .navbar .nav-collapse .dropdown-menu li>a:hover,.navbar .nav-collapse .dropdown-menu li>a:focus,.navbar .nav-collapse .dropdown-submenu:hover>a{background-image:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border:none;} .navbar .nav-collapse .nav-header{color:#2B7CAC;} .navbar-inverse .nav-collapse .nav li>a{color:#555555;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.1);} .navbar-inverse .nav-collapse .nav .active>a{background-color:rgba(0, 0, 0, 0.1);}}div.subnav{font-family:'Telex',sans-serif;text-shadow:1px 1px 0 rgba(255, 255, 255, 0.2);}div.subnav-fixed{top:50px;}
.btn{background-color:#ffffff;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(5%, #ffffff), to(#ffffff));background-image:-webkit-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 500%, #ffffff);background-image:-o-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffffffff', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 0;} .btn{background-color:#ffffff;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(5%, #ffffff), to(#ffffff));background-image:-webkit-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 500%, #ffffff);background-image:-o-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffffffff', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 0;}
.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#3daae9;background-image:-moz-linear-gradient(top, #46aeea, #2fa4e7);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#46aeea), to(#2fa4e7));background-image:-webkit-linear-gradient(top, #46aeea, #2fa4e7);background-image:-o-linear-gradient(top, #46aeea, #2fa4e7);background-image:linear-gradient(to bottom, #46aeea, #2fa4e7);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff46aeea', endColorstr='#ff2fa4e7', GradientType=0);border-color:#2fa4e7 #2fa4e7 #157ab5;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2fa4e7;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#2fa4e7;*background-color:#1a99e2;} .btn-primary{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;}
......
...@@ -16,12 +16,11 @@ ...@@ -16,12 +16,11 @@
.navbar { .navbar {
font-family: @headingsFontFamily;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
.brand { .brand {
padding: 16px 20px 14px; padding: 16px 20px 14px;
text-shadow: inherit; font-family: @headingsFontFamily;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
} }
li { li {
...@@ -30,7 +29,8 @@ ...@@ -30,7 +29,8 @@
.nav > li > a { .nav > li > a {
padding: 16px 10px 14px; padding: 16px 10px 14px;
text-shadow: inherit; font-family: @headingsFontFamily;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
} }
.search-query { .search-query {
...@@ -48,10 +48,24 @@ ...@@ -48,10 +48,24 @@
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3); text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
} }
.nav-collapse.collapse { &-inverse {
.navbar-search .search-query {
color: @textColor;
}
}
}
@media (max-width: @navbarCollapseWidth) {
.navbar .nav-collapse {
.nav li > a { .nav li > a {
font-family: @headingsFontFamily;
font-weight: normal;
color: @white; color: @white;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
&:hover { &:hover {
background-color: #2B7CAC; background-color: #2B7CAC;
...@@ -79,27 +93,18 @@ ...@@ -79,27 +93,18 @@
} }
} }
&-inverse { .navbar-inverse .nav-collapse {
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
.nav-collapse.collapse {
.nav li > a { .nav li > a {
color: @navbarInverseLinkColor; color: @navbarInverseLinkColor;
&:hover {
background-color: rgba(0, 0, 0, 0.1);
}
}
.nav .active > a { &:hover {
background-color: rgba(0, 0, 0, 0.1); background-color: rgba(0, 0, 0, 0.1);
} }
} }
.navbar-search .search-query { .nav .active > a {
color: @textColor; background-color: rgba(0, 0, 0, 0.1);
} }
} }
} }
......
...@@ -4864,26 +4864,6 @@ body { ...@@ -4864,26 +4864,6 @@ body {
.navbar .search-query.focused::-webkit-input-placeholder { .navbar .search-query.focused::-webkit-input-placeholder {
color: #999999; color: #999999;
} }
.navbar .nav-collapse.collapse .nav li > a {
border-left: 0;
color: #eeeeee;
font-weight: normal;
text-shadow: none;
}
.navbar .nav-collapse.collapse .nav li > a:hover {
background-color: #33b5e5;
}
.navbar .nav-collapse.collapse .nav .active > a {
background-color: #33b5e5;
}
.navbar .nav-collapse.collapse .navbar-form,
.navbar .nav-collapse.collapse .navbar-search {
border-top: none;
border-bottom: none;
}
.navbar .nav-collapse.collapse .nav-header {
color: rgba(128, 128, 128, 0.6);
}
.navbar-inverse .navbar-inner { .navbar-inverse .navbar-inner {
border: none; border: none;
border-bottom: 3px solid #000000; border-bottom: 3px solid #000000;
...@@ -4898,6 +4878,44 @@ body { ...@@ -4898,6 +4878,44 @@ body {
.navbar-inverse .nav .active > a { .navbar-inverse .nav .active > a {
border-bottom-color: transparent; border-bottom-color: transparent;
} }
@media (max-width: 979px) {
.navbar .nav-collapse .nav li > a {
border: none;
color: #eeeeee;
font-weight: normal;
text-shadow: none;
}
.navbar .nav-collapse .nav li > a:hover {
border: none;
background-color: #33b5e5;
}
.navbar .nav-collapse .nav .active > a {
border: none;
background-color: #33b5e5;
}
.navbar .nav-collapse .dropdown-menu a:hover {
background-color: #33b5e5;
}
.navbar .nav-collapse .navbar-form,
.navbar .nav-collapse .navbar-search {
border-top: none;
border-bottom: none;
}
.navbar .nav-collapse .nav-header {
color: rgba(128, 128, 128, 0.6);
}
.navbar-inverse .nav-collapse .nav li > a:hover {
background-color: #111;
}
.navbar-inverse .nav-collapse .nav .active > a {
background-color: #111;
}
.navbar-inverse .nav-collapse .nav li.dropdown.open > .dropdown-toggle,
.navbar-inverse .nav-collapse .nav li.dropdown.active > .dropdown-toggle,
.navbar-inverse .nav-collapse .nav li.dropdown.open.active > .dropdown-toggle {
background-color: #111;
}
}
div.subnav { div.subnav {
position: static; position: static;
background-color: #020202; background-color: #020202;
......
...@@ -819,15 +819,11 @@ body{min-height:100%;background-color:#121417;background-image:-moz-linear-gradi ...@@ -819,15 +819,11 @@ body{min-height:100%;background-color:#121417;background-image:-moz-linear-gradi
.navbar .search-query,.navbar .search-query:focus,.navbar .search-query.focused{color:#adafae;text-shadow:none;background-color:#222;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}.navbar .search-query:-moz-placeholder,.navbar .search-query:focus:-moz-placeholder,.navbar .search-query.focused:-moz-placeholder{color:#999999;} .navbar .search-query,.navbar .search-query:focus,.navbar .search-query.focused{color:#adafae;text-shadow:none;background-color:#222;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}.navbar .search-query:-moz-placeholder,.navbar .search-query:focus:-moz-placeholder,.navbar .search-query.focused:-moz-placeholder{color:#999999;}
.navbar .search-query:-ms-input-placeholder,.navbar .search-query:focus:-ms-input-placeholder,.navbar .search-query.focused:-ms-input-placeholder{color:#999999;} .navbar .search-query:-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;}
.navbar .nav-collapse.collapse .nav li>a{border-left:0;color:#eeeeee;font-weight:normal;text-shadow:none;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#33b5e5;}
.navbar .nav-collapse.collapse .nav .active>a{background-color:#33b5e5;}
.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:none;border-bottom:none;}
.navbar .nav-collapse.collapse .nav-header{color:rgba(128, 128, 128, 0.6);}
.navbar-inverse .navbar-inner{border:none;border-bottom:3px solid #000000;} .navbar-inverse .navbar-inner{border:none;border-bottom:3px solid #000000;}
.navbar-inverse .brand:hover{border-bottom:none;background-color:#000000;} .navbar-inverse .brand:hover{border-bottom:none;background-color:#000000;}
.navbar-inverse .nav li>a:hover{border-bottom-color:transparent;} .navbar-inverse .nav li>a:hover{border-bottom-color:transparent;}
.navbar-inverse .nav .active>a{border-bottom-color:transparent;} .navbar-inverse .nav .active>a{border-bottom-color:transparent;}
div.subnav{position:static;background-color:#020202;background-image:none;border