2.2.2 -> 2.3.0

[bootswatch] / amelia / bootswatch.less

diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index 8e93675..dfca0ac 100755 (executable)
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -1,4 +1,4 @@
-// Amelia 2.2.1
+// Amelia 2.3.0
 // Bootswatch
 // -----------------------------------------------------
 
@@ -6,8 +6,7 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url('https://fonts.googleapis.com/css?family=Lobster');
-@import url('https://fonts.googleapis.com/css?family=Cabin:400,700');
+@import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700');
 
 h6 {
        color: @textColor;
@@ -161,17 +160,12 @@ hr {
 
 div.subnav {
 
-       background-color: rgba(42, 99, 105, 0.9);
-       background-image: none;
-       border: 0px solid transparent;
+       margin: 0 1px;
+       background: rgba(42, 99, 105, 0.9) none;
+       border: none;
        .border-radius(0);
        .box-shadow(none);
 
-       .nav > li.open > a {
-               border-color: transparent;
-               background-color: rgba(255, 255, 255, 0.4);
-       }
-
        .nav > li > a {
                color: @textColor;
                border-color: transparent;
@@ -183,27 +177,27 @@ div.subnav {
        }
 
        .nav > .active > a {
-               background-color: transparent;
+               background-color: rgba(255, 255, 255, 0.4);
                border-color: transparent;
                color: @textColor;
                .box-shadow(none);
        }
 
-       .nav > .active > a:hover,
        .nav > li > a:hover,
-       .nav > li.active > a:hover, {
+       .nav > .active > a:hover, {
                border-right-color: transparent;
                background-color: rgba(255, 255, 255, 0.4);
                color: @textColor;
        }
 
-       .nav > li:first-child > a:hover {
-               border-left-color: rgba(255, 255, 255, 0.4);
-               border-left-width: 1px;
+       .nav > li.open > a {
+               border-color: transparent;
+               background-color: rgba(255, 255, 255, 0.4);
        }
 
        &-fixed {
-               top: 50px;
+               top: @navbarHeight + 1;
+               margin: 0;
        }
 }
 
@@ -227,17 +221,13 @@ div.subnav {
        }
 
        li.active > a,
-       li:active > a,
-       li.active > a:hover,
-       li:active > a:hover {
+       li.active > a:hover {
                color: @textColor;
        }
 
        li.active > a,
-       li:active > a,
        li > a:hover,
-       li.active > a:hover,
-       li:active > a:hover {
+       li.active > a:hover {
                background-color: #8AD5DC;
                border-color: transparent;
                text-shadow: none;
@@ -262,14 +252,13 @@ div.subnav {
        li > a,
        li > a:hover,
        li.active > a,
-       li:active > a,
-       li.active > a:hover,
-       li:active > a:hover {
+       li.active > a:hover {
                border-color: transparent;
        }
 }
 
 .nav-list {
+
        .nav-header {
                text-shadow: none;
                color: @textColor;
@@ -280,10 +269,8 @@ div.subnav {
        }
 
        li.active > a,
-       li:active > a,
        li > a:hover,
-       li.active > a:hover,
-       li:active > a:hover {
+       li.active > a:hover {
                background-color: #8AD5DC;
                text-shadow: none;
        }
@@ -447,18 +434,6 @@ div.subnav {
        .buttonBackgroundCustom(@btnPrimaryBackground);
 }
 
-.btn-large {
-       padding: 20px 24px;
-}
-
-.btn-small {
-       padding: 8px 12px;
-}
-
-.btn-mini {
-       padding: 4px 8px;
-}
-
 [class^="icon-"], [class*=" icon-"] {
        margin-top: 2px;
        margin-right: 8px;
@@ -573,6 +548,13 @@ input, textarea, .search-query, .uneditable-input,
 // ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
+.alert {
+
+       h1, h2, h3, h4, h5, h6 {
+               color: @textColor;
+       }
+}
+
 .alert, .label {
        border-color: transparent;
        .border-radius(0);