2.2.2 -> 2.3.0

[bootswatch] / cosmo / bootswatch.less

diff --git a/cosmo/bootswatch.less b/cosmo/bootswatch.less
index 2edfd97..9cdf2b6 100644 (file)
--- a/cosmo/bootswatch.less
+++ b/cosmo/bootswatch.less
@@ -1,4 +1,4 @@
-// Cosmo 2.2.1
+// Cosmo 2.3.0
 // Bootswatch
 // -----------------------------------------------------
 
@@ -6,7 +6,7 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url('http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700');
+@import url('//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700');
 
 body {
        font-weight: 300;
@@ -48,6 +48,18 @@ blockquote {
        color: @gray;
 }
 
+.text-warning        { color: @orange; }
+a.text-warning:hover { color: darken(@orange, 10%); }
+
+.text-error          { color: @red; }
+a.text-error:hover   { color: darken(@red, 10%); }
+
+.text-info           { color: @purple; }
+a.text-info:hover    { color: darken(@purple, 10%); }
+
+.text-success        { color: @green; }
+a.text-success:hover { color: darken(@green, 10%); }
+
 // SCAFFOLDING
 // -----------------------------------------------------
 
@@ -92,12 +104,18 @@ blockquote {
 
        &-inverse {
 
+               .brand,
+               .nav > li > a {
+                       text-shadow: none;
+               }
 
+               .brand:hover,
                .nav > .active > a,
                .nav > .active > a:hover,
                .nav > .active > a:focus {
-                       .box-shadow(none);
                        background-color: @navbarInverseLinkBackgroundHover;
+                       .box-shadow(none);
+                       color: @white;
                }
 
                .navbar-search .search-query {
@@ -108,10 +126,10 @@ blockquote {
 
 div.subnav {
 
-       background-color: @grayLight;
-       background-image: none;
+       margin: 0 1px;
+       background: @grayLight none;
        .box-shadow(none);
-       border-color: transparent;
+       border: none;
        .border-radius(0);
 
        .nav {
@@ -122,21 +140,17 @@ div.subnav {
                border-color: transparent;
        }
 
-       .nav > .active > a {
+       .nav > .active > a,
+       .nav > .active > a:hover {
                border-color: transparent;
-               background-color: transparent;
-               // border-left-width: 2px;
+               background-color: @black;
+               color: @white;
                .box-shadow(none);
-               color: @grayDarker;
-
-               &:hover {
-                       background-color: @black;
-                       color: @white;
-               }
        }
 
        &-fixed {
-               top: @navbarHeight;
+               top: @navbarHeight + 1;
+               margin: 0;
        }
 }
 
@@ -149,7 +163,6 @@ div.subnav {
        & > li.dropdown.open.active > a:hover {
                color: @blue;
        }
-
 }
 
 .nav-tabs {
@@ -178,6 +191,15 @@ div.subnav {
        }
 }
 
+.tabs-below,
+.tabs-left,
+.tabs-right {
+
+       & > .nav-tabs > li > a{
+               .border-radius(0);
+       }
+}
+
 .nav-pills {
 
        & > li > a {
@@ -298,7 +320,6 @@ div.subnav {
 // -----------------------------------------------------
 
 .btn {
-
        padding: 5px 12px;
        background-image: none;
        .box-shadow(none);
@@ -309,14 +330,18 @@ div.subnav {
        &.disabled {
                box-shadow: inset 0 2px 4px rgba(0,0,0,.15),~" "0 1px 2px rgba(0,0,0,.05);
        }
+}
 
-       &-large {
-               padding: 22px 30px;
-       }
+.btn-large {
+       padding: 22px 30px;
+}
 
-       &-mini {
-               padding: 2px 6px;
-       }
+.btn-small {
+       padding: 2px 10px;
+}
+
+.btn-mini {
+       padding: 2px 6px;
 }
 
 .btn-group {
@@ -379,7 +404,7 @@ input[type="search"], input[type="tel"], input[type="color"] {
 
        &.warning {
 
-               & > label,
+               .control-label,
                .help-block,
                .help-inline {
                        color: @orange;
@@ -395,7 +420,7 @@ input[type="search"], input[type="tel"], input[type="color"] {
 
        &.error {
 
-               & > label,
+               .control-label,
                .help-block,
                .help-inline {
                        color: @red;
@@ -411,7 +436,7 @@ input[type="search"], input[type="tel"], input[type="color"] {
 
        &.success {
 
-               & > label,
+               .control-label,
                .help-block,
                .help-inline {
                        color: @green;
@@ -471,11 +496,11 @@ legend {
        }
 
        &-info {
-               background-color: @blue;
+               background-color: @purple;
        }
 
        &-inverse {
-               background-color: @gray;
+               background-color: @black;
        }
 }
 
@@ -494,11 +519,11 @@ legend {
        }
 
        &-info {
-               background-color: @blue;
+               background-color: @purple;
        }
 
        &-inverse {
-               background-color: @gray;
+               background-color: @black;
        }
 }