2.2.2 -> 2.3.0

[bootswatch] / united / bootswatch.less

diff --git a/united/bootswatch.less b/united/bootswatch.less
index 20a3d4b..46b66f5 100755 (executable)
--- a/united/bootswatch.less
+++ b/united/bootswatch.less
@@ -1,12 +1,15 @@
-// Bootswatch.less
-// Swatch: United
-// Version: 2.0.4
+// United 2.3.0
+// Bootswatch
 // -----------------------------------------------------
 
+
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url(https://fonts.googleapis.com/css?family=Ubuntu);
+@import url(//fonts.googleapis.com/css?family=Ubuntu);
+
+// SCAFFOLDING
+// -----------------------------------------------------
 
 // NAVBAR
 // -----------------------------------------------------
@@ -14,22 +17,22 @@
 .navbar {
 
        .nav > li > a {
-               border-right: 1px solid #C03D14;
-               border-left: 1px solid #E6633A;
+               border-right: 1px solid rgba(0, 0, 0, 0.2);
+               border-left: 1px solid rgba(255, 255, 255, 0.1);
 
                &:hover {
-                       background-color: @linkColorHover;
+                       border-left: 1px solid rgba(0, 0, 0, 0.2);
                }
        }
 
-       .nav .active > a,
-       .nav .active > a:hover {
-         background-color: rgba(0,0,0,.2);
+       .nav > .active > a,
+       .nav > .active > a:hover {
+               border-left: 1px solid rgba(0, 0, 0, 0.2);
        }
 
        .divider-vertical {
                background-color: inherit;
-               border-right: 0px solid #CE4213;
+               border-right: 1px solid rgba(0, 0, 0, 0.2);
        }
 
        .navbar-text {
@@ -42,25 +45,46 @@
                margin-bottom: 3px;
                border: 1px solid darken(@navbarBackground, 15%);
        }
+}
 
-       .nav-collapse.collapse > .nav li > a {
-               color: @white;
-               border-left: 0px solid @orange;
-               border-right: 0px solid @orange;
+@media (max-width: @navbarCollapseWidth) {
 
-               &:hover {
-                       background-color: @linkColorHover;
+       .navbar .nav-collapse {
+
+               .nav li > a {
+                       color: @white;
+                       border-left: 0px solid @orange;
+                       border-right: 0px solid @orange;
+
+                       &:hover {
+                               background-color: rgba(0, 0, 0, 0.3) !important;
+                               background-image: none;
+                       }
+               }
+
+               .navbar-form,
+               .navbar-search {
+                       border-top: 0px solid @orange;
+                       border-bottom: 0px solid @orange;
+                       .box-shadow(none);
                }
-       }
 
-       .nav-collapse.collapse .navbar-form,
-       .nav-collapse.collapse .navbar-search {
-               border-top: 0px solid @orange;
-               border-bottom: 0px solid @orange;
-               .box-shadow(none);
+               .nav-header {
+                       color: @grayLighter;
+               }
        }
 }
 
+// NAV
+// -----------------------------------------------------
+
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover {
+       border-right: 1px solid #C03D14;
+       border-left: 1px solid #E6633A;
+}
+
 // BUTTONS
 // -----------------------------------------------------
 
@@ -72,17 +96,25 @@
   .buttonBackground(lighten(@yellow, 15%), @yellow);
 }
 
+// TABLES
+// -----------------------------------------------------
+
 // FORMS
 // -----------------------------------------------------
 
+// DROPDOWNS
+// -----------------------------------------------------
 
-// MISC
+// ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
 .alert {
        text-shadow: none;
 }
 
+// MISC
+// -----------------------------------------------------
+
 .hero-unit {
     border: 1px solid rgba(0,0,0,.05);
     .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
@@ -91,3 +123,6 @@
                line-height: 1.6em;
        }
 }
+
+// MEDIA QUERIES
+// -----------------------------------------------------