diff options
Diffstat (limited to 'spacelab')
| -rw-r--r-- | spacelab/bootstrap.css | 33 | ||||
| -rw-r--r-- | spacelab/bootstrap.min.css | 5 | ||||
| -rwxr-xr-x | spacelab/bootswatch.less | 53 |
3 files changed, 53 insertions, 38 deletions
diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 7c147000..2825c928 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -4800,15 +4800,6 @@ a.badge:hover { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5); color: #2d2d2d; } -.navbar .nav-collapse.collapse .navbar-search { - border-top: none; - border-bottom: none; -} -.navbar .nav-collapse.collapse > .nav li > a:hover { - background-color: #558bc4; - color: #ffffff; - text-shadow: none; -} .navbar-inverse .brand { text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); } @@ -4823,10 +4814,6 @@ a.badge:hover { .navbar-inverse .nav li.dropdown.open:hover > .dropdown-toggle .caret { border-top-color: #ffffff; } -.navbar-inverse .nav-collapse.collapse .nav li > a, -.navbar-inverse .nav-collapse.collapse .nav-header { - color: #eeeeee; -} .navbar-inverse .navbar-search .search-query, .navbar-inverse .navbar-search .search-query:hover { color: #ffffff; @@ -4843,6 +4830,26 @@ a.badge:hover { .navbar-inverse .navbar-search .search-query:hover::-webkit-input-placeholder { color: #eeeeee; } +@media (max-width: 979px) { + .navbar .nav-collapse .nav li > a:hover { + background-color: #558bc4; + color: #ffffff; + text-shadow: none; + } + .navbar .nav-collapse .navbar-search { + border-top: none; + border-bottom: none; + } + .navbar-inverse .nav-collapse .nav li > a { + color: #eeeeee; + } + .navbar-inverse .nav-collapse .nav li > a:hover { + background-color: #558bc4 !important; + } + .navbar-inverse .nav-collapse .nav-header { + color: #eeeeee; + } +} div.subnav .nav > li > a { color: #2d2d2d; } diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css index 2fc0cbc2..2050111d 100644 --- a/spacelab/bootstrap.min.css +++ b/spacelab/bootstrap.min.css @@ -809,16 +809,13 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .navbar .navbar-search .search-query:-ms-input-placeholder,.navbar .navbar-search .search-query:hover:-ms-input-placeholder{color:#bbbbbb;} .navbar .navbar-search .search-query::-webkit-input-placeholder,.navbar .navbar-search .search-query:hover::-webkit-input-placeholder{color:#bbbbbb;} .navbar .navbar-search .search-query:focus,.navbar .navbar-search .search-query:hover:focus,.navbar .navbar-search .search-query.focused,.navbar .navbar-search .search-query:hover.focused{-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);color:#2d2d2d;} -.navbar .nav-collapse.collapse .navbar-search{border-top:none;border-bottom:none;} -.navbar .nav-collapse.collapse >.nav li>a:hover{background-color:#558bc4;color:#ffffff;text-shadow:none;} .navbar-inverse .brand{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}.navbar-inverse .brand:hover{color:#ffffff;} .navbar-inverse .nav>li>a{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);} .navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown:hover>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open:hover>.dropdown-toggle .caret{border-top-color:#ffffff;} -.navbar-inverse .nav-collapse.collapse .nav li>a,.navbar-inverse .nav-collapse.collapse .nav-header{color:#eeeeee;} .navbar-inverse .navbar-search .search-query,.navbar-inverse .navbar-search .search-query:hover{color:#ffffff;}.navbar-inverse .navbar-search .search-query:-moz-placeholder,.navbar-inverse .navbar-search .search-query:hover:-moz-placeholder{color:#eeeeee;} .navbar-inverse .navbar-search .search-query:-ms-input-placeholder,.navbar-inverse .navbar-search .search-query:hover:-ms-input-placeholder{color:#eeeeee;} .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder,.navbar-inverse .navbar-search .search-query:hover::-webkit-input-placeholder{color:#eeeeee;} -div.subnav .nav>li>a{color:#2d2d2d;}div.subnav .nav>li>a:hover{color:#558bc4;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a:hover{background-color:#558bc4;color:#ffffff;text-shadow:none;} .navbar .nav-collapse .navbar-search{border-top:none;border-bottom:none;} .navbar-inverse .nav-collapse .nav li>a{color:#eeeeee;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:#558bc4 !important;} .navbar-inverse .nav-collapse .nav-header{color:#eeeeee;}}div.subnav .nav>li>a{color:#2d2d2d;}div.subnav .nav>li>a:hover{color:#558bc4;} div.subnav .nav>li.active>a{color:#2d2d2d;}div.subnav .nav>li.active>a:hover{color:#2d2d2d;} 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:#2d2d2d;}div.subnav .nav>li.dropdown.open>.dropdown-toggle:hover{color:#558bc4;} diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index fe41fd82..55da0c11 100755 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -56,20 +56,6 @@ } } - .nav-collapse.collapse { - - .navbar-search { - border-top: none; - border-bottom: none; - } - - & > .nav li > a:hover { - background-color: @linkColor; - color: @white; - text-shadow: none; - } - } - &-inverse { .brand { @@ -90,13 +76,6 @@ border-top-color: @white; } - .nav-collapse.collapse { - .nav li > a, - .nav-header { - color: @grayLighter; - } - } - .navbar-search .search-query, .navbar-search .search-query:hover { @@ -107,6 +86,38 @@ } } +@media (max-width: @navbarCollapseWidth) { + + .navbar .nav-collapse { + + .nav li > a:hover { + background-color: @linkColor; + color: @white; + text-shadow: none; + } + + .navbar-search { + border-top: none; + border-bottom: none; + } + } + + .navbar-inverse .nav-collapse { + + .nav li > a { + color: @grayLighter; + + &:hover { + background-color: @linkColor !important; + } + } + + .nav-header { + color: @grayLighter; + } + } +} + div.subnav { .nav > li > a { |