amelia, cosmo: fixes #53

[bootswatch] / amelia / bootswatch.less

diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index 2aec417..a844d2d 100755 (executable)
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -1,8 +1,8 @@
-// Bootswatch.less
-// Swatch: Amelia
-// Version: 2.1.0
+// Amelia 2.2.2
+// Bootswatch
 // -----------------------------------------------------
 
+
 // TYPOGRAPHY
 // -----------------------------------------------------
 
@@ -104,9 +104,23 @@ hr {
                padding: 4px;
        }
 
-       .nav-collapse.collapse {
+       &-inverse {
+
+               .dropdown-menu li > a:hover,
+               .dropdown-menu li > a:focus,
+               .dropdown-submenu:hover > a {
+                       background-image: none;
+                       background-color: @yellow;
+               }
+       }
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+       .navbar .nav-collapse {
 
                .nav li > a {
+
                        color: @textColor;
                        .border-radius(0);
 
@@ -136,20 +150,11 @@ hr {
                }
        }
 
-       &-inverse {
-
-               .dropdown-menu li > a:hover,
-               .dropdown-menu li > a:focus,
-               .dropdown-submenu:hover > a {
-                       background-image: none;
-                       background-color: @yellow;
-               }
-
-               .nav-collapse.collapse {
+       .navbar-inverse .nav-collapse {
 
-                       .nav li > a:hover {
-                               background-color: lighten(@navbarInverseBackground, 10%);
-                       }
+               .nav li > a:hover,
+               .dropdown-menu a:hover {
+                       background-color: lighten(@navbarInverseBackground, 10%) !important;
                }
        }
 }
@@ -186,7 +191,8 @@ div.subnav {
 
        .nav > .active > a:hover,
        .nav > li > a:hover,
-       .nav > li.active > a:hover, {
+       .nav > .active > a,
+       .nav > .active > a:hover, {
                border-right-color: transparent;
                background-color: rgba(255, 255, 255, 0.4);
                color: @textColor;
@@ -222,17 +228,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;
@@ -257,14 +259,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;
@@ -275,10 +276,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;
        }
@@ -318,26 +317,32 @@ div.subnav {
        ul  {
                background-color: @paginationBackground;
                background-image: none;
+               .border-radius(0);
        }
 
-       .disabled a, .disabled a:hover {
-               color: @textColor;
-       }
-
-       li a:hover {
+       ul > li > a:hover {
                background-color: rgba(255, 255, 255, 0.4);
                color: @linkColor;
        }
 
-       .active a, .active a:hover {
-               background-color: rgba(255, 255, 255, 0.4);
+       ul > li:first-child > a,
+       ul > li:last-child > a {
+               .border-radius(0);
+       }
+
+       ul > .disabled > a,
+       ul > .disabled > a:hover,
+       ul > .disabled > span,
+       ul > .disabled > span:hover {
                color: @textColor;
        }
 
-       ul,
-       li:first-child a,
-       li:last-child a {
-               .border-radius(0);
+       ul > .active > a,
+       ul > .active > a:hover,
+       ul > .active > span,
+       ul > .active > span:hover {
+               background-color: rgba(255, 255, 255, 0.4);
+               color: @textColor;
        }
 }
 
@@ -436,10 +441,6 @@ div.subnav {
        .buttonBackgroundCustom(@btnPrimaryBackground);
 }
 
-.btn-small {
-       padding: 13px 16px 12px;
-}
-
 [class^="icon-"], [class*=" icon-"] {
        margin-top: 2px;
        margin-right: 8px;
@@ -554,6 +555,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);