diff options
Diffstat (limited to 'slate')
| -rw-r--r-- | slate/bootstrap.css | 58 | ||||
| -rw-r--r-- | slate/bootstrap.min.css | 6 | ||||
| -rwxr-xr-x | slate/bootswatch.less | 46 |
3 files changed, 62 insertions, 48 deletions
diff --git a/slate/bootstrap.css b/slate/bootstrap.css index 18e172c5..8d003b89 100644 --- a/slate/bootstrap.css +++ b/slate/bootstrap.css @@ -4825,32 +4825,6 @@ legend, .navbar .dropdown-menu::after { border-bottom: 6px solid #3a3f44; } -.navbar .nav-collapse.collapse .nav li > a, -.navbar .nav-collapse.collapse .nav li.active > a, -.navbar .nav-collapse.collapse .nav li > a:hover, -.navbar .nav-collapse.collapse .nav li.active > a:hover { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - color: #bbbfc2; - border: 1px solid transparent; - background-color: transparent; - background-image: none; -} -.navbar .nav-collapse.collapse .nav li > a:hover, -.navbar .nav-collapse.collapse .nav li.active > a:hover { - background-color: #272b30; -} -.navbar .nav-collapse.collapse .navbar-form, -.navbar .nav-collapse.collapse .navbar-search { - border-color: transparent; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.navbar .nav-collapse.collapse .nav-header { - color: #757c82; -} .navbar-inverse .navbar-inner { background-color: #151719; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#202328), color-stop(70%, #151719), to(#151719)); @@ -4875,6 +4849,38 @@ legend, background-image: -o-linear-gradient(280deg, #202328, #272b30); background-image: linear-gradient(280deg, #202328, #272b30); } +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a, + .navbar .nav-collapse .nav li > a:hover, + .navbar .nav-collapse .nav .active > a, + .navbar .nav-collapse .nav .active > a:hover { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + color: #bbbfc2; + border: 1px solid transparent; + background-color: transparent; + background-image: none; + } + .navbar .nav-collapse .nav li > a:hover, + .navbar .nav-collapse .nav .active > a:hover { + background-color: #272b30; + } + .navbar .nav-collapse .navbar-form, + .navbar .nav-collapse .navbar-search { + border-color: transparent; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .navbar .nav-collapse .nav-header { + color: #757c82; + } + .navbar-inverse .nav-collapse .nav li > a:hover, + .navbar-inverse .nav-collapse .nav .active > a:hover { + background-color: #272b30 !important; + } +} div.subnav { background-color: #3a3f44; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44)); diff --git a/slate/bootstrap.min.css b/slate/bootstrap.min.css index 945b34a2..83199b80 100644 --- a/slate/bootstrap.min.css +++ b/slate/bootstrap.min.css @@ -811,14 +811,10 @@ hr,legend,.page-header{border-top:none;border-bottom:1px solid #1c1e22;backgroun .navbar .navbar-search .search-query{border:1px solid #2e3134;} .navbar .divider-vertical{background-color:transparent;border-right:none;} .navbar .dropdown-menu::after{border-bottom:6px solid #3a3f44;} -.navbar .nav-collapse.collapse .nav li>a,.navbar .nav-collapse.collapse .nav li.active>a,.navbar .nav-collapse.collapse .nav li>a:hover,.navbar .nav-collapse.collapse .nav li.active>a:hover{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#bbbfc2;border:1px solid transparent;background-color:transparent;background-image:none;} -.navbar .nav-collapse.collapse .nav li>a:hover,.navbar .nav-collapse.collapse .nav li.active>a:hover{background-color:#272b30;} -.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.navbar .nav-collapse.collapse .nav-header{color:#757c82;} .navbar-inverse .navbar-inner{background-color:#151719;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#202328), color-stop(70%, #151719), to(#151719));background-image:-webkit-linear-gradient(#202328, #151719 70%, #151719);background-image:-moz-linear-gradient(top, #202328, #151719 7000%, #151719);background-image:-o-linear-gradient(#202328, #151719 70%, #151719);background-image:linear-gradient(#202328, #151719 70%, #151719);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff202328', endColorstr='#ff151719', GradientType=0);} .navbar-inverse .nav li>a{background-image:none;background-color:transparent;} .navbar-inverse .nav li>a:hover,.navbar-inverse .nav li.active>a,.navbar-inverse .nav li.active>a:hover{background-color:#272b30;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #202328, #272b30);background-image:-webkit-linear-gradient(280deg, #202328, #272b30);background-image:-o-linear-gradient(280deg, #202328, #272b30);background-image:linear-gradient(280deg, #202328, #272b30);} -div.subnav{background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';}div.subnav .nav>li>a{color:#bbbfc2;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);border-right:1px solid #2e3134;border-left:1px solid #52575c;}div.subnav .nav>li>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;border-right:1px solid transparent;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a,.navbar .nav-collapse .nav li>a:hover,.navbar .nav-collapse .nav .active>a,.navbar .nav-collapse .nav .active>a:hover{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#bbbfc2;border:1px solid transparent;background-color:transparent;background-image:none;} .navbar .nav-collapse .nav li>a:hover,.navbar .nav-collapse .nav .active>a:hover{background-color:#272b30;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .nav-collapse .nav-header{color:#757c82;} .navbar-inverse .nav-collapse .nav li>a:hover,.navbar-inverse .nav-collapse .nav .active>a:hover{background-color:#272b30 !important;}}div.subnav{background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';}div.subnav .nav>li>a{color:#bbbfc2;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);border-right:1px solid #2e3134;border-left:1px solid #52575c;}div.subnav .nav>li>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;border-right:1px solid transparent;} div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#43494f;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #30353b, #43494f);background-image:-webkit-linear-gradient(280deg, #30353b, #43494f);background-image:-o-linear-gradient(280deg, #30353b, #43494f);background-image:linear-gradient(280deg, #30353b, #43494f);border-right:1px solid #2e3134;} div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{border-left:1px solid transparent;} div.subnav.subnav-fixed .nav>li.active:first-child>a,div.subnav.subnav-fixed .nav>li:first-child>a:hover{border-left:1px solid #2e3134;} diff --git a/slate/bootswatch.less b/slate/bootswatch.less index 6dd84fa6..9d7c443c 100755 --- a/slate/bootswatch.less +++ b/slate/bootswatch.less @@ -78,12 +78,33 @@ hr, legend, .page-header { border-bottom: 6px solid @grayDark; } - .nav-collapse.collapse { + &-inverse { + + .navbar-inner { + #gradient > .vertical-three-colors(darken(@grayDarker, 3%), darken(@grayDarker, 8%), 70%, darken(@grayDarker, 8%)); + } + + .nav li > a { + background-image: none; + background-color: transparent; + } - .nav li > a, - .nav li.active > a, .nav li > a:hover, + .nav li.active > a, .nav li.active > a:hover { + #gradient > .directional(darken(@grayDarker, 3%), @grayDarker, 280deg); + } + } +} + +@media (max-width: @navbarCollapseWidth) { + + .navbar .nav-collapse { + + .nav li > a, + .nav li > a:hover, + .nav .active > a, + .nav .active > a:hover { .box-shadow(none); color: @grayLighter; border: 1px solid transparent; @@ -92,7 +113,7 @@ hr, legend, .page-header { } .nav li > a:hover, - .nav li.active > a:hover { + .nav .active > a:hover { background-color: @grayDarker; } @@ -107,26 +128,17 @@ hr, legend, .page-header { } } - &-inverse { - - .navbar-inner { - #gradient > .vertical-three-colors(darken(@grayDarker, 3%), darken(@grayDarker, 8%), 70%, darken(@grayDarker, 8%)); - } - - .nav li > a { - background-image: none; - background-color: transparent; - } + .navbar-inverse .nav-collapse { .nav li > a:hover, - .nav li.active > a, - .nav li.active > a:hover { - #gradient > .directional(darken(@grayDarker, 3%), @grayDarker, 280deg); + .nav .active > a:hover { + background-color: @grayDarker !important; } } } div.subnav { + #gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark); border: 1px solid transparent; .box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)'); |