updated to 2.2.1

[bootswatch] / spruce / bootswatch.less

diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less
index 24235df..f2f164b 100755 (executable)
--- a/spruce/bootswatch.less
+++ b/spruce/bootswatch.less
@@ -1,8 +1,8 @@
-// Bootswatch.less
-// Swatch: Spruce
-// Version: 2.1.0
+// Spruce 2.2.1
+// Bootswatch
 // -----------------------------------------------------
 
+
 // TYPOGRAPHY
 // --------------------------------------------------
 
@@ -127,37 +127,36 @@ blockquote {
                color: @white;
        }
 
-       .nav > .open > a {
-               color: @yellow;
+       .btn-navbar {
+               margin-top: 14px;
        }
 
-       .nav > .open > .dropdown-menu {
-               background-color: @headingsColor;
-               color: @textColor;
+       .navbar-form, .navbar-search {
                border-color: transparent;
+               .box-shadow(none);
        }
+}
 
-       .nav > .open > .dropdown-menu a:hover {
-               background-color: darken(#90A38F, 10%);
-               color: @headingsColor;
-       }
+@media (max-width: @navbarCollapseWidth) {
 
-       .btn-navbar {
-               margin-top: 14px;
+       .navbar .nav-collapse {
+
+               .nav li > a {
+                       color: @headingsColor;
+
+                       &:hover {
+                               color: @yellow;
+                               background-color: @blue;
+                       }
+               }       
        }
 
-       .nav-collapse.in .nav li > a {
-               color: @headingsColor;
+       .navbar-inverse .nav-collapse {
 
-               &:hover {
-                       color: @yellow;
-                       background-color: @blue;
+               .nav li > a:hover {
+                       background-color: rgba(0, 0, 0, 0.06) !important;
                }
-       }
 
-       .navbar-form, .navbar-search {
-               border-color: transparent;
-               .box-shadow(none);
        }
 }
 
@@ -344,14 +343,15 @@ div.subnav {
 
 .pagination {
 
-       & > ul {
+       ul {
                background-color: darken(#90A38F, 10%);
                background-image: none;
                border-color: transparent;
                .box-shadow(none);
        }
 
-       a {
+       ul > li > a,
+       ul > li > span {
                color: @yellow;
                border-color: transparent;
 
@@ -361,13 +361,16 @@ div.subnav {
                }
        }
 
-       .active a {
+       ul > .active > a,
+       ul > .active > span {
                color: @headingsColor;
                background-color: rgba(0, 0, 0, 0.1);
        }
 
-       .disabled a,
-       .disabled a:hover {
+       ul > .disabled > a,
+       ul > .disabled > a:hover,
+       ul > .disabled > span,
+       ul > .disabled > span:hover {
                color: @blue;
        }
 }
@@ -394,47 +397,17 @@ div.subnav {
 // --------------------------------------------------
 
 .btn {
-       .buttonBackground(lighten(@blueDark, 5%), @blueDark);
        font-family: @headingsFontFamily;
        font-weight: @headingsFontWeight;
-    color: @white;
     text-shadow: none;
        border-color: transparent;
        .box-shadow(none);
-
-       &:hover {
-               color: @grayLighter;
-       }
 }
 
 .btn-large {
        font-size: 18px;
 }
 
-.btn-primary {
-       .buttonBackground(lighten(@blue, 10%), lighten(@blue, 5%));
-}
-
-.btn-warning {
-  .buttonBackground(@orange, darken(@orange, 5%));
-}
-
-.btn-danger {
-  .buttonBackground(lighten(@red, 5%), @red);
-}
-
-.btn-success {
-  .buttonBackground(#62c462, #51a351);
-}
-
-.btn-info {
-  .buttonBackground(#5bc0de, #2f96b4);
-}
-
-.btn-inverse {
-  .buttonBackground(@yellow, darken(@yellow, 5%));
-}
-
 .btn-group .dropdown-toggle {
        .box-shadow(none);
 }
@@ -508,6 +481,42 @@ legend {
        .border-radius(4px);
 }
 
+.control-group.error {
+
+       label, .help-block, .help-inline {
+               color: lighten(@red, 30%);
+       }
+
+       input, select, textarea {
+               border: 2px solid lighten(@red, 30%);
+               color: @textColor;
+       }
+}
+
+.control-group.success {
+
+       label, .help-block, .help-inline {
+               color: lighten(#24C00B, 25%);
+       }
+
+       input, select, textarea {
+               border: 2px solid lighten(#24C00B, 25%);
+               color: @textColor;
+       }
+}
+
+.control-group.warning {
+
+       label, .help-block, .help-inline {
+               color: lighten(@orange, 25%);
+       }
+
+       input, select, textarea {
+               border: 2px solid lighten(@orange, 25%);
+               color: @textColor;
+       }
+}
+
 // ALERTS, LABELS, BADGES
 // --------------------------------------------------