cosmo: fixes #65, nav-tabs border-radius bug

[bootswatch] / cosmo / bootswatch.less

diff --git a/cosmo/bootswatch.less b/cosmo/bootswatch.less
index bb9d3e4..c5ce122 100644 (file)
--- a/cosmo/bootswatch.less
+++ b/cosmo/bootswatch.less
@@ -1,4 +1,4 @@
-// Cosmo 2.2.1
+// Cosmo 2.2.2
 // Bootswatch
 // -----------------------------------------------------
 
@@ -6,7 +6,7 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url('https://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;
@@ -117,7 +117,7 @@ div.subnav {
        background-color: @grayLight;
        background-image: none;
        .box-shadow(none);
-       border-color: transparent;
+       border: none;
        .border-radius(0);
 
        .nav {
@@ -128,17 +128,13 @@ div.subnav {
                border-color: transparent;
        }
 
-       .nav > .active > a {
+       .nav > .active > a,
+       .nav > .active > a:hover {
                border-color: transparent;
-               background-color: transparent;
+               background-color: @black;
+               color: @white;
                // border-left-width: 2px;
                .box-shadow(none);
-               color: @grayDarker;
-
-               &:hover {
-                       background-color: @black;
-                       color: @white;
-               }
        }
 
        &-fixed {
@@ -184,6 +180,15 @@ div.subnav {
        }
 }
 
+.tabs-below,
+.tabs-left,
+.tabs-right {
+
+       & > .nav-tabs > li > a{
+               .border-radius(0);
+       }
+}
+
 .nav-pills {
 
        & > li > a {
@@ -304,7 +309,6 @@ div.subnav {
 // -----------------------------------------------------
 
 .btn {
-
        padding: 5px 12px;
        background-image: none;
        .box-shadow(none);
@@ -315,14 +319,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 {
@@ -385,7 +393,7 @@ input[type="search"], input[type="tel"], input[type="color"] {
 
        &.warning {
 
-               & > label,
+               .control-label,
                .help-block,
                .help-inline {
                        color: @orange;
@@ -401,7 +409,7 @@ input[type="search"], input[type="tel"], input[type="color"] {
 
        &.error {
 
-               & > label,
+               .control-label,
                .help-block,
                .help-inline {
                        color: @red;
@@ -417,7 +425,7 @@ input[type="search"], input[type="tel"], input[type="color"] {
 
        &.success {
 
-               & > label,
+               .control-label,
                .help-block,
                .help-inline {
                        color: @green;