sync

[bootswatch] / yeti / bootswatch.less

diff --git a/yeti/bootswatch.less b/yeti/bootswatch.less
index d5fb987..4227c47 100644 (file)
--- a/yeti/bootswatch.less
+++ b/yeti/bootswatch.less
@@ -1,8 +1,8 @@
-// Yeti 3.0.2
+// Yeti 3.0.3
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700");
+@import url("//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700");
 
 // Navbar =====================================================================
 
@@ -23,12 +23,10 @@
        .dropdown {
 
                &-menu {
-                       padding: 0;
                        border: none;
 
                        > li > a,
                        > li > a:focus {
-                               padding: 12px 15px;
                                background-color: transparent;
                                font-size: 13px;
                                font-weight: 300;
@@ -94,11 +92,105 @@
        &-xs {
                padding: 4px 8px;
        }
+}
+
+.btn-group {
 
-       &-group > .btn + .dropdown-toggle {
+       .btn ~ .dropdown-toggle {
                padding-left: 16px;
                padding-right: 16px;
        }
+
+       .dropdown-menu {
+               border-top-width: 0;
+       }
+
+       &.dropup .dropdown-menu {
+               border-top-width: 1px;
+               border-bottom-width: 0;
+               margin-bottom: 0;
+       }
+
+       .dropdown-toggle {
+
+               &.btn-default ~ .dropdown-menu {
+                       background-color: @btn-default-bg;
+                       border-color: @btn-default-border;
+
+                       > li > a {
+                               color: @btn-default-color;
+                       }
+
+                       > li > a:hover {
+                               background-color: darken(@btn-default-bg, 8%);
+                       }
+               }
+
+               &.btn-primary ~ .dropdown-menu {
+                       background-color: @btn-primary-bg;
+                       border-color: @btn-primary-border;
+
+                       > li > a {
+                               color: @btn-primary-color;
+                       }
+
+                       > li > a:hover {
+                               background-color: darken(@btn-primary-bg, 8%);
+                       }
+               }
+
+               &.btn-success ~ .dropdown-menu {
+                       background-color: @btn-success-bg;
+                       border-color: @btn-success-border;
+
+                       > li > a {
+                               color: @btn-success-color;
+                       }
+
+                       > li > a:hover {
+                               background-color: darken(@btn-success-bg, 8%);
+                       }
+               }
+
+               &.btn-info ~ .dropdown-menu {
+                       background-color: @btn-info-bg;
+                       border-color: @btn-info-border;
+
+                       > li > a {
+                               color: @btn-info-color;
+                       }
+
+                       > li > a:hover {
+                               background-color: darken(@btn-info-bg, 8%);
+                       }
+               }
+
+               &.btn-warning ~ .dropdown-menu {
+                       background-color: @btn-warning-bg;
+                       border-color: @btn-warning-border;
+
+                       > li > a {
+                               color: @btn-warning-color;
+                       }
+
+                       > li > a:hover {
+                               background-color: darken(@btn-warning-bg, 8%);
+                       }
+               }
+
+               &.btn-danger ~ .dropdown-menu {
+                       background-color: @btn-danger-bg;
+                       border-color: @btn-danger-border;
+
+                       > li > a {
+                               color: @btn-danger-color;
+                       }
+
+                       > li > a:hover {
+                               background-color: darken(@btn-danger-bg, 8%);
+                       }
+               }
+       }
 }
 
 // Typography =================================================================
@@ -157,6 +249,14 @@ label,
 
 // Navs =======================================================================
 
+.nav {
+       .open > a,
+       .open > a:hover,
+       .open > a:focus {
+               border-color: transparent;
+       }
+}
+
 .nav-tabs {
        > li > a {
                background-color: @btn-default-bg;
@@ -186,15 +286,27 @@ label,
        font-weight: 300;
        color: @gray-light;
 
-       > li,
+       > li {
+               > a,
+               > span {
+                       margin-left: 4px;
+                       color: @gray-light;
+               }
+       }
+
+       > .active {
+               > a,
+               > span {
+                       color: #fff;
+               }
+       }
+
        > li,
        > li:first-child,
        > li:last-child {
                > a,
                > span {
-                       margin-left: 4px;
                        border-radius: 3px;
-                       color: @gray-light;
                }
        }
 
@@ -264,8 +376,13 @@ label,
 .dropdown {
 
        &-menu {
+               padding: 0;
                margin-top: 0;
                font-size: @font-size-small;
+
+               > li > a {
+                       padding: 12px 15px;
+               }
        }
 
        &-header {
@@ -281,3 +398,11 @@ label,
        font-size: 12px;
        font-weight: 300;
 }
+
+.panel {
+       &-heading,
+       &-footer {
+               border-top-right-radius: 0;
+               border-top-left-radius: 0;
+       }
+}