2.2.2 -> 2.3.0

[bootswatch] / superhero / bootswatch.less

diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less
index eedb71c..80bc458 100755 (executable)
--- a/superhero/bootswatch.less
+++ b/superhero/bootswatch.less
@@ -1,13 +1,12 @@
-// Bootswatch.less
-// Swatch: Superhero
-// Version: 2.1.1
+// Superhero 2.3.0
+// Bootswatch
 // -----------------------------------------------------
 
+
 // TYPOGRAPHY
 // --------------------------------------------------
 
-@import url(https://fonts.googleapis.com/css?family=Oswald);
-@import url(https://fonts.googleapis.com/css?family=Noticia+Text);
+@import url('//fonts.googleapis.com/css?family=Oswald|Noticia+Text');
 
 h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, h6 {
        font-family: @headingsFontFamily;
@@ -170,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);
                }
 
@@ -339,23 +325,28 @@ div.subnav {
                border-color: transparent;
        }
 
-       li > a {
+       ul > li > a,
+       ul > li > span {
                border: none;
                color: @textColor;
        }
 
-       li.active > a,
-       li.active > a:hover {
-               background-color: @orange;
-               color: @white;
+       ul > li > a:hover {
+               background: lighten(@blue, 10%);
        }
 
-       li > a:hover {
-               background: lighten(@blue, 10%);
+       ul > .active > a,
+       ul > .active > a:hover,
+       ul > .active > span,
+       ul > .active > span:hover {
+               background-color: @orange;
+               color: @white;
        }
 
-       li.disabled > a,
-       li.disabled > a:hover {
+       ul > .disabled > a,
+       ul > .disabled > a:hover,
+       ul > .disabled > span,
+       ul > .disabled > span:hover {
                background: darken(@blue, 5%);
        }
 }
@@ -659,4 +650,4 @@ label {
                        }
                }
        }
-}
\ No newline at end of file
+}