update to bootstrap v2.2.2

[bootswatch] / united / bootswatch.less

diff --git a/united/bootswatch.less b/united/bootswatch.less
index 8efda4a..fccfc97 100755 (executable)
--- a/united/bootswatch.less
+++ b/united/bootswatch.less
@@ -1,13 +1,16 @@
-// Bootswatch.less
-// Swatch: United
-// Version: 2.1.0
+// United 2.2.2
+// Bootswatch
 // -----------------------------------------------------
 
+
 // TYPOGRAPHY
 // -----------------------------------------------------
 
 @import url(https://fonts.googleapis.com/css?family=Ubuntu);
 
+// SCAFFOLDING
+// -----------------------------------------------------
+
 // NAVBAR
 // -----------------------------------------------------
 
@@ -42,8 +45,11 @@
                margin-bottom: 3px;
                border: 1px solid darken(@navbarBackground, 15%);
        }
+}
 
-       .nav-collapse.collapse {
+@media (max-width: @navbarCollapseWidth) {
+
+       .navbar .nav-collapse {
 
                .nav li > a {
                        color: @white;
@@ -51,7 +57,7 @@
                        border-right: 0px solid @orange;
 
                        &:hover {
-                               background-color: rgba(0, 0, 0, 0.3);
+                               background-color: rgba(0, 0, 0, 0.3) !important;
                                background-image: none;
                        }
                }
@@ -69,6 +75,16 @@
        }
 }
 
+// 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
 // -----------------------------------------------------
 
@@ -80,24 +96,25 @@
   .buttonBackground(lighten(@yellow, 15%), @yellow);
 }
 
-// NAVIGATION
+// TABLES
 // -----------------------------------------------------
 
+// FORMS
+// -----------------------------------------------------
 
-.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;
-}
+// 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));
@@ -106,3 +123,6 @@
                line-height: 1.6em;
        }
 }
+
+// MEDIA QUERIES
+// -----------------------------------------------------