less-rails-bootswatch 0.3.1 → 0.3.2

data/lib/less/rails/bootswatch/version.rb

@@ -1,7 +1,7 @@
 module Less
   module Rails
     module Bootswatch
-      VERSION = "0.3.1"
+      VERSION = "0.3.2"
     end
   end
 end

data/vendor/frameworks/stylesheets/bootswatch/amelia/bootswatch.less

@@ -104,9 +104,23 @@ hr {
 		padding: 4px;
 	}
 
-	.nav-collapse.collapse {
+	&-inverse {
+
+		.dropdown-menu li > a:hover,
+		.dropdown-menu li > a:focus,
+		.dropdown-submenu:hover > a {
+			background-image: none;
+			background-color: @yellow;
+		}
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+	.navbar .nav-collapse {
 
 		.nav li > a {
+
 			color: @textColor;
 			.border-radius(0);
 
@@ -136,20 +150,11 @@ hr {
 		}
 	}
 
-	&-inverse {
+	.navbar-inverse .nav-collapse {
 
-		.dropdown-menu li > a:hover,
-		.dropdown-menu li > a:focus,
-		.dropdown-submenu:hover > a {
-			background-image: none;
-			background-color: @yellow;
-		}
-
-		.nav-collapse.collapse {
-
-			.nav li > a:hover {
-				background-color: lighten(@navbarInverseBackground, 10%);
-			}
+		.nav li > a:hover,
+		.dropdown-menu a:hover {
+			background-color: lighten(@navbarInverseBackground, 10%) !important;
 		}
 	}
 }

data/vendor/frameworks/stylesheets/bootswatch/cerulean/bootswatch.less

@@ -16,12 +16,11 @@
 
 .navbar {
 
-	font-family: @headingsFontFamily;
-	text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
 
 	.brand {
-		padding: 16px 20px 14px;
-		text-shadow: inherit;
+		padding: 14px 20px 16px;
+		font-family: @headingsFontFamily;
+		text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
 	}
 
 	li {
@@ -30,7 +29,8 @@
 
 	.nav > li > a {
 		padding: 16px 10px 14px;
-		text-shadow: inherit;
+		font-family: @headingsFontFamily;
+		text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
 	}
 
 	.search-query {
@@ -48,10 +48,24 @@
 		text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
 	}
 
-	.nav-collapse.collapse {
+	&-inverse {
+
+		.navbar-search .search-query {
+			color: @textColor;
+		}
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+	.navbar .nav-collapse {
 
 		.nav li > a {
+
+			font-family: @headingsFontFamily;
+			font-weight: normal;
 			color: @white;
+			text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
 
 			&:hover {
 				background-color: #2B7CAC;
@@ -79,27 +93,18 @@
 		}
 	}
 
-	&-inverse {
-
-		text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
-
-		.nav-collapse.collapse {
+	.navbar-inverse .nav-collapse {
 
-			.nav li > a {
-				color: @navbarInverseLinkColor;
-
-				&:hover {
-					background-color: rgba(0, 0, 0, 0.1);
-				}
-			}
+		.nav li > a {
+			color: @navbarInverseLinkColor;
 
-			.nav .active > a {
+			&:hover {
 				background-color: rgba(0, 0, 0, 0.1);
 			}
 		}
 
-		.navbar-search .search-query {
-			color: @textColor;
+		.nav .active > a {
+			background-color: rgba(0, 0, 0, 0.1);
 		}
 	}
 }

data/vendor/frameworks/stylesheets/bootswatch/cyborg/bootswatch.less

@@ -114,20 +114,50 @@ body {
 		.placeholder(@gray);
 	}
 
-	.nav-collapse.collapse {
+	&-inverse {
+
+		.navbar-inner {
+			border: none;
+			border-bottom: 3px solid @black;
+		}
+
+		.brand:hover {
+			border-bottom: none;
+			background-color: @black;
+		}
+
+		.nav li > a:hover {
+			border-bottom-color: transparent;
+		}
+
+		.nav .active > a {
+			border-bottom-color: transparent;
+		}
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+	.navbar .nav-collapse {
 
 		.nav li > a {
-			border-left: 0;
+			border: none;
 			color: @grayLighter;
 			font-weight: normal;
 			text-shadow: none;
 
 			&:hover {
+				border: none;
 				background-color: @blue;
 			}
 		}
 
 		.nav .active > a {
+			border: none;
+			background-color: @blue;
+		}
+
+		.dropdown-menu a:hover {
 			background-color: @blue;
 		}
 
@@ -142,24 +172,20 @@ body {
 		}
 	}
 
-	&-inverse {
-
-		.navbar-inner {
-			border: none;
-			border-bottom: 3px solid @black;
-		}
-
-		.brand:hover {
-			border-bottom: none;
-			background-color: @black;
-		}
+	.navbar-inverse .nav-collapse {
 
 		.nav li > a:hover {
-			border-bottom-color: transparent;
+			background-color: #111;
 		}
 
 		.nav .active > a {
-			border-bottom-color: transparent;
+			background-color: #111;
+		}
+
+		.nav li.dropdown.open > .dropdown-toggle,
+		.nav li.dropdown.active > .dropdown-toggle,
+		.nav li.dropdown.open.active > .dropdown-toggle {
+			background-color: #111;
 		}
 	}
 }

data/vendor/frameworks/stylesheets/bootswatch/journal/bootswatch.less

@@ -72,7 +72,7 @@ hr {
 	}
 
 	.brand {
-		padding: 16px 20px 20px;
+		padding: 19px 20px 21px;
 		font-size: 24px;
 		font-weight: bold;
 		text-shadow: none;
@@ -80,23 +80,22 @@ hr {
 	}
 
 	.nav > li > a {
-		padding: 20px 10px 21px;
+		padding: 20px 10px 20px;
 		font-size: 18px;
 		text-shadow: none;
 		text-transform: uppercase;
 	}
 
-	.nav > li.active > a {
+	.nav > .active > a {
 		background-color: transparent;
-		color: @headingsColor;
 	}
 
 	.navbar-text {
-		margin-top: 21px;
+		margin-top: 20px;
 		padding-left: 10px;
 		padding-right: 10px;
 		font-size: 18px;
-		line-height: 18px;
+		line-height: 20px;
 	}
 
 	.nav > .active > a,
@@ -105,15 +104,9 @@ hr {
 		.box-shadow(none);
 	}
 
-	.nav li.dropdown > .dropdown-toggle:hover,
-	.nav li.dropdown.active > .dropdown-toggle:hover {
-		color: @black;
-	}
-
-	.nav li.dropdown > .dropdown-toggle .caret,
-	.nav li.dropdown.open > .dropdown-toggle:hover .caret {
-		border-top-color: @headingsColor;
-		border-bottom-color: @headingsColor;
+	.divider-vertical {
+		border-left-color: @grayLighter;
+		border-right-color: @grayLighter;
 	}
 
 	.dropdown-menu {
@@ -127,10 +120,29 @@ hr {
 		}
 	}
 
-	.nav-collapse.collapse {
+	.navbar-search .search-query,
+	.navbar-search .search-query:hover {
+		border: 2px solid @grayLighter;
+		color: @textColor;
+		.placeholder(@gray);
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+	.nav-collapse .navbar-form,
+	.nav-collapse .navbar-search {
+		margin-bottom: 0;
+		border-top: 2px solid @grayLighter;
+		border-bottom: 2px solid @grayLighter;
+	} 
+
+
+
+	.navbar .nav-collapse {
 
 		.nav li > a {
-			color: @headingsColor;
+			color: @navbarLinkColor;
 
 			&:hover {
 				background-color: @dropdownLinkBackgroundHover;
@@ -142,11 +154,17 @@ hr {
 		}
 	}
 
-	.navbar-search .search-query,
-	.navbar-search .search-query:hover {
-		border: 2px solid @grayLighter;
-		color: @textColor;
-		.placeholder(@gray);
+	.navbar-inverse .nav-collapse {
+
+		.nav li > a {
+			color: @navbarInverseLinkColor;
+
+			&:hover {
+				background-color: #111;
+				background-image: none;
+			}
+		}
+
 	}
 }
 
@@ -306,15 +324,4 @@ legend {
 	.nav > li.dropdown.open.active > a:hover {
 		border-color: #e5e5e5;
 	}
-}
-
-@media (max-width: 979px) {
-
-	.nav-collapse .navbar-form,
-	.nav-collapse .navbar-search {
-		margin-bottom: 0;
-		border-top: 2px solid @grayLighter;
-		border-bottom: 2px solid @grayLighter;
-	} 
-
-}
+}

data/vendor/frameworks/stylesheets/bootswatch/readable/bootswatch.less

@@ -97,7 +97,17 @@ code, pre {
 		border-left: none;
 	}
 
-	.nav-collapse.collapse {
+	&-inverse {
+
+		.brand:hover {
+			color: @white;
+		}
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+	.navbar .nav-collapse {
 
 		.nav li:first-child > a {
 			margin-bottom: 10px;
@@ -125,24 +135,16 @@ code, pre {
 		}
 	}
 
-	&-inverse {
+	.navbar-inverse .nav-collapse {
 
-		.brand:hover {
-			color: @white;
+		.nav li > a {
+			color: @grayLighter;
 		}
 
-		.nav-collapse.collapse {
-
-			.nav li > a {
-				color: @grayLighter;
-			}
-
-			.nav li > a:hover {
-				background-color: rgba(0, 0, 0, 0.2);
-				color: @white;
-			}
+		.nav li > a:hover {
+			background-color: rgba(0, 0, 0, 0.2) !important;
+			color: @white;
 		}
-
 	}
 }
 

data/vendor/frameworks/stylesheets/bootswatch/simplex/bootswatch.less

@@ -76,31 +76,21 @@ hr {
 		font-family: @headingsFontFamily;
 	}
 
-	.nav li.dropdown.open > .dropdown-toggle,
-	.nav li.dropdown.active > .dropdown-toggle:hover {
-		color: @linkColor;
-	}
+	&-inverse {
 
-	.nav li.dropdown .dropdown-toggle .caret {
-		border-top-color: @textColor;
-		border-bottom-color: @textColor;
-		opacity: 1;
-	}
+		.navbar-inner {
+			.box-shadow(none);
+		}
 
-	.nav li.dropdown .dropdown-toggle:hover .caret,
-	.nav li.dropdown.active > .dropdown-toggle .caret, 
-	.nav li.dropdown.open .dropdown-toggle .caret {
-		border-top-color: @linkColor;
-		border-bottom-color: @linkColor;
+		.brand:hover {
+			color: @white;
+		}
 	}
+}
 
-	.nav > .active > a,
-	.nav > .active > a:hover,
-	.nav > .active > a:focus {
-		// .box-shadow(none);
-	}
+@media (max-width: @navbarCollapseWidth) {
 
-	.nav-collapse.collapse {
+	.navbar .nav-collapse {
 
 		.nav li > a {
 			color: @textColor;
@@ -111,6 +101,9 @@ hr {
 			}
 		}
 
+		.nav .active > a {
+			.box-shadow(none);
+		}
 
 		.navbar-form,
 		.navbar-search {
@@ -119,41 +112,18 @@ hr {
 		}
 	}
 
-	&-inverse {
-
-		.navbar-inner {
-			.box-shadow(none);
-		}
+	.navbar-inverse .nav-collapse {
 
-		.brand:hover {
-			color: @white;
-		}
-
-		.nav li.dropdown.open .dropdown-toggle {
+		.nav li > a {
 			color: @white;
-		}
 
-		.nav li.dropdown .dropdown-toggle .caret,
-		.nav li.dropdown .dropdown-toggle:hover .caret,
-		.nav li.dropdown.active .dropdown-toggle .caret,
-		.nav li.dropdown.open .dropdown-toggle .caret {
-			border-top-color: @white;
-			border-bottom-color: @white;
-		}
-
-		.nav-collapse.collapse {
-
-			.nav li > a {
-				color: @white;
-
-				&:hover {
-					background-color: rgba(255, 255, 255, 0.1);
-				}
+			&:hover {
+				background-color: rgba(255, 255, 255, 0.1) !important;
 			}
+		}
 
-			.nav-header {
-				color: rgba(255, 255, 255, 0.7);
-			}
+		.nav-header {
+			color: rgba(255, 255, 255, 0.7);
 		}
 	}
 }
@@ -190,32 +160,6 @@ div.subnav {
 		.box-shadow(none);
 		color: @linkColor;
 	}
-
-	.nav > li.dropdown.open > a,
-	.nav > li.dropdown.open > a:hover {
-		border-left-color: transparent;
-		border-right-color: transparent;
-		background-color: transparent;
-		color: @linkColor;
-	}
-
-	.nav li.dropdown .dropdown-toggle .caret {
-		border-top-color: @textColor;
-		border-bottom-color: @textColor;
-		opacity: 1;
-	}
-
-	.nav li.dropdown .dropdown-toggle:hover .caret,
-	.nav li.dropdown.active .dropdown-toggle .caret,
-	.nav li.dropdown.open .dropdown-toggle .caret {
-		border-top-color: @linkColor;
-		border-bottom-color: @linkColor;
-		opacity: 1;
-	}
-
-	.dropdown.open:hover .dropdown-toggle {
-		background-color: transparent;
-	}
 }
 
 // NAV
@@ -492,12 +436,3 @@ i[class^="icon-"]{
 
 // MEDIA QUERIES
 // -----------------------------------------------------
-
-@media (max-width: 979px) {
-
-	.nav-collapse.collapse .navbar-form,
-	.nav-collapse.collapse .navbar-search {
-		border-top: 1px solid @grayLighter;
-		border-bottom: 1px solid @grayLighter;
-	}
-}

data/vendor/frameworks/stylesheets/bootswatch/slate/bootswatch.less

@@ -78,12 +78,33 @@ hr, legend, .page-header {
 		border-bottom: 6px solid @grayDark;
 	}
 
-	.nav-collapse.collapse {
+	&-inverse {
+
+		.navbar-inner {
+			#gradient > .vertical-three-colors(darken(@grayDarker, 3%), darken(@grayDarker, 8%), 70%, darken(@grayDarker, 8%));
+		}
+
+		.nav li > a {
+			background-image: none;
+			background-color: transparent;
+		}
 
-		.nav li > a,
-		.nav li.active > a,
 		.nav li > a:hover,
+		.nav li.active > a,
 		.nav li.active > a:hover {
+			#gradient > .directional(darken(@grayDarker, 3%), @grayDarker, 280deg);
+		}
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+	.navbar .nav-collapse {
+
+		.nav li > a,
+		.nav li > a:hover,
+		.nav .active > a,
+		.nav .active > a:hover {
 			.box-shadow(none);
 			color: @grayLighter;
 			border: 1px solid transparent;
@@ -92,7 +113,7 @@ hr, legend, .page-header {
 		}
 
 		.nav li > a:hover,
-		.nav li.active > a:hover {
+		.nav .active > a:hover {
 			background-color: @grayDarker;
 		}
 
@@ -107,26 +128,17 @@ hr, legend, .page-header {
 		}
 	}
 
-	&-inverse {
-
-		.navbar-inner {
-			#gradient > .vertical-three-colors(darken(@grayDarker, 3%), darken(@grayDarker, 8%), 70%, darken(@grayDarker, 8%));
-		}
-
-		.nav li > a {
-			background-image: none;
-			background-color: transparent;
-		}
+	.navbar-inverse .nav-collapse {
 
 		.nav li > a:hover,
-		.nav li.active > a,
-		.nav li.active > a:hover {
-			#gradient > .directional(darken(@grayDarker, 3%), @grayDarker, 280deg);
+		.nav .active > a:hover {
+			background-color: @grayDarker !important;
 		}
 	}
 }
 
 div.subnav {
+
 	#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
 	border: 1px solid transparent;
 	.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');

data/vendor/frameworks/stylesheets/bootswatch/spacelab/bootswatch.less

@@ -6,6 +6,8 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
+@import url('http://fonts.googleapis.com/css?family=Muli');
+
 // SCAFFOLDING
 // -----------------------------------------------------
 
@@ -20,7 +22,8 @@
 	}
 
 	.brand {
-		font-weight: bold;
+
+		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
 
 		&:hover {
 			color: @linkColor;
@@ -29,8 +32,7 @@
 
 	.nav > li > a {
 		padding: 11px 10px 9px;
-		font-weight: bold;
-		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
 	}
 
 	.navbar-text {
@@ -42,6 +44,7 @@
 	.navbar-search .search-query,
 	.navbar-search .search-query:hover {
 		margin-bottom: 0;
+		line-height: normal;
 		color: @grayLight;
 		.placeholder(@grayLight);
 		.box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.5));
@@ -53,24 +56,10 @@
 		}
 	}
 
-	.nav-collapse.collapse {
-
-		.navbar-search {
-			border-top: none;
-			border-bottom: none;
-		}
-
-		& > .nav li > a:hover {
-			background-color: @linkColor;
-			color: @white;
-			text-shadow: none;
-		}
-
-	}
-
 	&-inverse {
+
 		.brand {
-			text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5);
+			text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
 
 			&:hover {
 				color: @white;
@@ -78,7 +67,7 @@
 		}
 
 		.nav > li > a {
-			text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5);
+			text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
 		}
 
 		.nav li.dropdown.open > .dropdown-toggle .caret,
@@ -87,19 +76,52 @@
 			border-top-color: @white;
 		}
 
-		.nav-collapse.collapse {
-			.nav li > a,
-			.nav-header {
-				color: @grayLighter;
+		.navbar-search .search-query,
+		.navbar-search .search-query:hover {
+
+			color: @white;
+
+			.placeholder(@grayLighter);
+		}
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+	.navbar .nav-collapse {
+
+		.nav li > a:hover {
+			background-color: @linkColor;
+			color: @white;
+			text-shadow: none;
+		}
+
+		.navbar-search {
+			border-top: none;
+			border-bottom: none;
+		}
+	}
+
+	.navbar-inverse .nav-collapse {
+
+		.nav li > a {
+			color: @grayLighter;
+
+			&:hover {
+				background-color: @linkColor !important;
 			}
 		}
+
+		.nav-header {
+			color: @grayLighter;
+		}
 	}
 }
 
 div.subnav {
 
 	.nav > li > a {
-		font-weight: bold;
+
 		color: @textColor;
 
 		&:hover {
@@ -108,6 +130,7 @@ div.subnav {
 	}
 
 	.nav > li.active > a {
+
 		color: @textColor;
 
 		&:hover {
@@ -120,6 +143,7 @@ div.subnav {
 	}
 
 	.nav > li.dropdown.open > .dropdown-toggle {
+
 		border-left: 1px solid whiteSmoke;
 		border-right: 1px solid #E5E5E5;
 		color: @textColor;
@@ -154,6 +178,24 @@ div.subnav {
 // -----------------------------------------------------
 
 .btn {
+
+
+	&-info,
+	&-info:hover,
+	&-info.disabled {
+		
+		color: @textColor;
+		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
+
+		.caret {
+			border-top-color: @textColor;
+			border-bottom-color: @textColor;
+		}
+	}
+
+}
+
+/*.btn {
 	.buttonBackground(#F4F4F4, #ECECEC);
 	color: @textColor;
 	text-shadow: none;
@@ -190,7 +232,7 @@ div.subnav {
 
 .btn-inverse {
   .buttonBackground(lighten(@purple, 5%), @purple);
-}
+}*/
 
 // TABLES
 // -----------------------------------------------------
@@ -216,13 +258,38 @@ div.subnav {
 // ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
+.alert {
+	color: @white;
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.label, .badge {
+
+	padding-top: 4px;
+
+	&-important {
+		background-color: @red;
+	}
+
+	&-warning {
+		background-color: @orange;
+	}
+
+	&-success {
+		background-color: @green;
+	}
+
+	&-info {
+		background-color: @blue;
+	}
+}
+
 // MISC
 // -----------------------------------------------------
 
-.label-important, .badge-important { background-color: #BD2C00; }
-.label-warning, .badge-warning   { background-color: #E3E84D; }
-.label-success, .badge-success   { background-color: #6CC644; }
-.label-info, .badge-info      { background-color: #4183C4; }
+.well {
+	background-color: @grayLighter;
+}
 
 .hero-unit {
     .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));

data/vendor/frameworks/stylesheets/bootswatch/spacelab/variables.less

@@ -12,22 +12,22 @@
 // Grays
 // -------------------------
 @black:                 #000;
-@grayDarker:            #222;
+@grayDarker:            #2D2D2D;
 @grayDark:              #333;
-@gray:                  #555;
-@grayLight:             #999;
-@grayLighter:           #ddd;
+@gray:                  #777;
+@grayLight:             #bbb;
+@grayLighter:           #eee;
 @white:                 #fff;
 
 
 // Accent colors
 // -------------------------
-@blue:                  #4183C4;
+@blue:                  #3399F3;
 @blueDark:              #405A6A;
-@green:                 #84DE81;
-@red:                   #E5322C;
+@green:                 #819E37;
+@red:                   #CD0200;
 @yellow:                #F4CA00;
-@orange:                #FF7D00;
+@orange:                #D47500;
 @pink:                  #F44B8C;
 @purple:                #405A6A;
 
@@ -35,28 +35,28 @@
 // Scaffolding
 // -------------------------
 @bodyBackground:        @white;
-@textColor:             @grayDark;
+@textColor:             @grayDarker;
 
 
 // Links
 // -------------------------
-@linkColor:             #4183C4;
+@linkColor:             #558BC4;
 @linkColorHover:        @linkColor;
 
 
 // Typography
 // -------------------------
-@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@sansFontFamily:        "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif;
 @serifFontFamily:       Georgia, "Times New Roman", Times, serif;
 @monoFontFamily:        Menlo, Monaco, Consolas, "Courier New", monospace;
 
 @baseFontSize:          14px;
 @baseFontFamily:        @sansFontFamily;
-@baseLineHeight:        20px;
+@baseLineHeight:        21px;
 @altFontFamily:         @serifFontFamily;
 
 @headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
-@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsFontWeight:    normal;    // instead of browser default, bold
 @headingsColor:         inherit; // empty to use BS default, @textColor
 
 
@@ -71,26 +71,26 @@
 // Buttons
 // -------------------------
 @btnBackground:                     @white;
-@btnBackgroundHighlight:            darken(@white, 10%);
-@btnBorder:                         darken(@white, 20%);
+@btnBackgroundHighlight:            @grayLighter;
+@btnBorder:                         darken(@btnBackground, 20%);
 
-@btnPrimaryBackground:              @linkColor;
-@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 15%);
+@btnPrimaryBackground:              lighten(@linkColor, 15%);
+@btnPrimaryBackgroundHighlight:     @linkColor;
 
-@btnInfoBackground:                 #5bc0de;
-@btnInfoBackgroundHighlight:        #2f96b4;
+@btnInfoBackground:                 lighten(@grayLight, 15%);
+@btnInfoBackgroundHighlight:        @grayLight;
 
-@btnSuccessBackground:              #62c462;
-@btnSuccessBackgroundHighlight:     #51a351;
+@btnSuccessBackground:              lighten(@green, 15%);
+@btnSuccessBackgroundHighlight:     @green;
 
 @btnWarningBackground:              lighten(@orange, 15%);
 @btnWarningBackgroundHighlight:     @orange;
 
-@btnDangerBackground:               #ee5f5b;
-@btnDangerBackgroundHighlight:      #bd362f;
+@btnDangerBackground:               lighten(@red, 15%);
+@btnDangerBackgroundHighlight:      @red;
 
-@btnInverseBackground:              @gray;
-@btnInverseBackgroundHighlight:     @grayDarker;
+@btnInverseBackground:              lighten(@navbarInverseBackground, 15%);
+@btnInverseBackgroundHighlight:     @navbarInverseBackground;
 
 
 // Forms
@@ -159,9 +159,9 @@
 @navbarCollapseWidth:             979px;
 
 @navbarHeight:                    40px;
-@navbarBackground:                #EAEAEA;
-@navbarBackgroundHighlight:       lighten(@navbarBackground, 15%);
-@navbarBorder:                    darken(@navbarBackground, 12%);
+@navbarBackground:                @grayLight;
+@navbarBackgroundHighlight:       #eee;
+@navbarBorder:                    darken(@navbarBackground, 5%);
 
 @navbarText:                      @textColor;
 @navbarLinkColor:                 @textColor;
@@ -173,9 +173,9 @@
 @navbarBrandColor:                @grayDark;
 
 // Inverted navbar
-@navbarInverseBackground:                @gray;
-@navbarInverseBackgroundHighlight:       lighten(@navbarInverseBackground, 5%);
-@navbarInverseBorder:                    #252525;
+@navbarInverseBackground:                #6C737E;
+@navbarInverseBackgroundHighlight:       lighten(@navbarInverseBackground, 25%);
+@navbarInverseBorder:                    darken(@navbarInverseBackground, 5%);
 
 @navbarInverseText:                      @grayLighter;
 @navbarInverseLinkColor:                 @grayLighter;
@@ -187,7 +187,7 @@
 @navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
 @navbarInverseSearchBackgroundFocus:     @white;
 @navbarInverseSearchBorder:              @navbarInverseBackground;
-@navbarInverseSearchPlaceholderColor:    #ccc;
+@navbarInverseSearchPlaceholderColor:    @grayLighter;
 
 @navbarInverseBrandColor:                @navbarInverseLinkColor;
 
@@ -208,20 +208,20 @@
 
 // Form states and alerts
 // -------------------------
-@warningText:             #393939;
-@warningBackground:       #F5F3B4;
+@warningText:             @white;
+@warningBackground:       @orange;
 @warningBorder:           darken(spin(@warningBackground, -10), 3%);
 
-@errorText:               @warningText;
-@errorBackground:         #FFE9E9;
+@errorText:               @white;
+@errorBackground:         @red;
 @errorBorder:             darken(spin(@errorBackground, -10), 3%);
 
-@successText:             #333;
-@successBackground:       #BEDEBE;
+@successText:             @white;
+@successBackground:       @green;
 @successBorder:           darken(spin(@successBackground, -10), 5%);
 
-@infoText:                #1B3650;
-@infoBackground:          #E4F0FF;
+@infoText:                @white;
+@infoBackground:          @blue;
 @infoBorder:              darken(spin(@infoBackground, -10), 7%);
 
 

data/vendor/frameworks/stylesheets/bootswatch/spruce/bootswatch.less

@@ -146,21 +146,35 @@ blockquote {
 		margin-top: 14px;
 	}
 
-	.nav-collapse.in .nav li > a {
-		color: @headingsColor;
-
-		&:hover {
-			color: @yellow;
-			background-color: @blue;
-		}
-	}
-
 	.navbar-form, .navbar-search {
 		border-color: transparent;
 		.box-shadow(none);
 	}
 }
 
+@media (max-width: @navbarCollapseWidth) {
+
+	.navbar .nav-collapse {
+
+		.nav li > a {
+			color: @headingsColor;
+
+			&:hover {
+				color: @yellow;
+				background-color: @blue;
+			}
+		}	
+	}
+
+	.navbar-inverse .nav-collapse {
+
+		.nav li > a:hover {
+			background-color: rgba(0, 0, 0, 0.06) !important;
+		}
+
+	}
+}
+
 div.subnav {
 	background-color: @green;
 	background-image: none;

data/vendor/frameworks/stylesheets/bootswatch/superhero/bootswatch.less

@@ -139,11 +139,23 @@ blockquote.pull-right {
 		background-color: @blue;
 		border-color: transparent;
 	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
 
-	.nav-collapse.collapse {
+	.navbar .nav-collapse {
 
 		.border-radius(4px);
 
+		.nav li > a {
+			color: @orange;
+
+			&:hover {
+				background-color: lighten(@blue, 10%) !important;
+				background-image: none;
+			}
+		}
+
 		.navbar-form,
 		.navbar-search {
 			border-top: none;
@@ -154,15 +166,6 @@ blockquote.pull-right {
 		.nav-header {
 			color: @textColor;
 		}
-
-		.nav li > a {
-			color: @orange;
-
-			&:hover {
-				background-color: lighten(@blue, 10%);
-				background-image: none;
-			}
-		}
 	}
 }
 
@@ -656,4 +659,4 @@ label {
 			}
 		}
 	}
-}
+}

data/vendor/frameworks/stylesheets/bootswatch/united/bootswatch.less

@@ -45,8 +45,11 @@
 		margin-bottom: 3px;
 		border: 1px solid darken(@navbarBackground, 15%);
 	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
 
-	.nav-collapse.collapse {
+	.navbar .nav-collapse {
 
 		.nav li > a {
 			color: @white;
@@ -54,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;
 			}
 		}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: less-rails-bootswatch
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap