diff options
Diffstat (limited to 'superhero')
| -rw-r--r-- | superhero/bootstrap.css | 31 | ||||
| -rw-r--r-- | superhero/bootstrap.min.css | 10 | ||||
| -rwxr-xr-x | superhero/bootswatch.less | 31 |
3 files changed, 22 insertions, 50 deletions
diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css index 68bf950b..b09ad44d 100644 --- a/superhero/bootstrap.css +++ b/superhero/bootstrap.css @@ -5258,53 +5258,40 @@ blockquote.pull-right { } } div.subnav { - background-color: #45515f; - background-image: none; + margin: 0 1px; + background: #45515f none; border: none; } div.subnav .nav > li > a, div.subnav .nav > li.active > a { - border-left: none; - border-right: none; + 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 + 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; + border-color: transparent; } div.subnav .nav > li.active > a, div.subnav .nav > li.active > a:hover { - color: #ffffff; - background-color: #e36b23; - background-image: none; + background: #e36b23 none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; + color: #ffffff; } div.subnav.subnav-fixed { - top: 70px; + 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.active > 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; - padding-left: 12px; - padding-right: 12px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css index 1f2e41b1..3507c680 100644 --- a/superhero/bootstrap.min.css +++ b/superhero/bootstrap.min.css @@ -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 [class^="icon-"],.navbar [class*=" icon-"]{vertical-align:20%;} .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;} -div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover{background-color:#5a6a7d;} -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: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;} +@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;border-color: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.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.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;} .nav .nav-header{color:#ece9d7;text-shadow:none;} diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less index c6dffca1..5c54200e 100755 --- a/superhero/bootswatch.less +++ b/superhero/bootswatch.less @@ -169,52 +169,39 @@ blockquote.pull-right { } div.subnav { - background-color: @blue; - background-image: none; + margin: 0 1px; + background: @blue none; border: none; .nav > li > a, .nav > li.active > a { - border-left: none; - border-right: none; + border-color: transparent; color: @textColor; } .nav > li > a:hover, .nav > li.active > a:hover { background-color: lighten(@blue, 10%); - } - - .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); + border-color: transparent; } .nav > li.active > a, .nav > li.active > a:hover { - color: @white; - background-color: @orange; - background-image: none; + background: @orange none; .box-shadow(none); + color: @white; } &.subnav-fixed { - top: 70px; + top: @navbarHeight + 1; + margin: 0; .box-shadow(none); .nav > li > a, - .nav > li.active > a, .nav > li > a:hover, + .nav > li.active > a, .nav > li.active > a:hover { border-color: transparent; - padding-left: 12px; - padding-right: 12px; .border-radius(0); } |