bootswatch-rails 0.3.2 → 0.4.0

data/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss

@@ -1,4 +1,4 @@
-// Spacelab 2.2.2
+// Spacelab 2.3.0
 // Variables
 // --------------------------------------------------
 
@@ -13,7 +13,7 @@ $black:                 #000 !default;
 $grayDarker:            #2D2D2D !default;
 $grayDark:              #434848 !default;
 $gray:                  #666 !default;
-$grayLight:             #bbb !default;
+$grayLight:             #ccc !default;
 $grayLighter:           #eee !default;
 $white:                 #fff !default;
 
@@ -83,70 +83,6 @@ $tableBackgroundHover:              #f5f5f5 !default; // for hover
 $tableBorder:                       #ddd !default; // table and cell border
 
 
-// Navbar
-// -------------------------
-$navbarCollapseWidth:             979px !default;
-$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1 !default;
-
-$navbarHeight:                    40px !default;
-$navbarBackgroundHighlight:       $grayLighter !default;
-$navbarBackground:                lighten($grayLight, 5%) !default;
-$navbarBorder:                    $grayLight !default;
-
-$navbarText:                      $textColor !default;
-$navbarLinkColor:                 $textColor !default;
-$navbarLinkColorHover:            $black !default;
-$navbarLinkColorActive:           $black !default;
-$navbarLinkBackgroundHover:       transparent !default;
-$navbarLinkBackgroundActive:      transparent !default;
-
-$navbarBrandColor:                $navbarLinkColor !default;
-
-// Inverted navbar
-$navbarInverseBackground:                #6C737E !default;
-$navbarInverseBackgroundHighlight:       lighten($navbarInverseBackground, 25%) !default;
-$navbarInverseBorder:                    darken($navbarInverseBackground, 5%) !default;
-
-$navbarInverseText:                      $grayLighter !default;
-$navbarInverseLinkColor:                 $grayLighter !default;
-$navbarInverseLinkColorHover:            $white !default;
-$navbarInverseLinkColorActive:           $white !default;
-$navbarInverseLinkBackgroundHover:       transparent !default;
-$navbarInverseLinkBackgroundActive:      $navbarInverseBackground !default;
-
-$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%) !default;
-$navbarInverseSearchBackgroundFocus:     $white !default;
-$navbarInverseSearchBorder:              $navbarInverseBackground !default;
-$navbarInverseSearchPlaceholderColor:    $grayLighter !default;
-
-$navbarInverseBrandColor:                $navbarInverseLinkColor !default;
-
-
-// Buttons
-// -------------------------
-$btnBackground:                     $white !default;
-$btnBackgroundHighlight:            $grayLighter !default;
-$btnBorder:                         darken($btnBackground, 20%) !default;
-
-$btnPrimaryBackground:              lighten($linkColor, 10%) !default;
-$btnPrimaryBackgroundHighlight:     $linkColor !default;
-
-$btnInfoBackground:                 lighten(#3A5D83, 10%) !default;
-$btnInfoBackgroundHighlight:        #3A5D83 !default;
-
-$btnSuccessBackground:              lighten($green, 10%) !default;
-$btnSuccessBackgroundHighlight:     $green !default;
-
-$btnWarningBackground:              lighten($orange, 10%) !default;
-$btnWarningBackgroundHighlight:     $orange !default;
-
-$btnDangerBackground:               lighten($red, 10%) !default;
-$btnDangerBackgroundHighlight:      $red !default;
-
-$btnInverseBackground:              lighten($navbarInverseBackground, 15%) !default;
-$btnInverseBackgroundHighlight:     $navbarInverseBackground !default;
-
-
 // Forms
 // -------------------------
 $inputBackground:               $white !default;
@@ -161,8 +97,8 @@ $inputHeight:                   $baseLineHeight + 10px !default; // base line-he
 // -------------------------
 $dropdownBackground:            $white !default;
 $dropdownBorder:                rgba(0,0,0,.2) !default;
-$dropdownDividerTop:            #e5e5e5 !default;
-$dropdownDividerBottom:         $white !default;
+$dropdownDividerTop:            rgba(0, 0, 0, 0.1) !default;
+$dropdownDividerBottom:         rgba(255, 255, 255, 0.5) !default;
 
 $dropdownLinkColor:             $textColor !default;
 $dropdownLinkColorHover:        $white !default;
@@ -215,6 +151,70 @@ $horizontalComponentOffset:       180px !default;
 $wellBackground:                  $grayLighter !default;
 
 
+// Navbar
+// -------------------------
+$navbarCollapseWidth:             979px !default;
+$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1 !default;
+
+$navbarHeight:                    40px !default;
+$navbarBackgroundHighlight:       $grayLighter !default;
+$navbarBackground:                darken($grayLighter, 5%) !default;
+$navbarBorder:                    $grayLight !default;
+
+$navbarText:                      $textColor !default;
+$navbarLinkColor:                 $textColor !default;
+$navbarLinkColorHover:            $linkColor !default;
+$navbarLinkColorActive:           $linkColor !default;
+$navbarLinkBackgroundHover:       transparent !default;
+$navbarLinkBackgroundActive:      transparent !default;
+
+$navbarBrandColor:                $navbarLinkColor !default;
+
+// Inverted navbar
+$navbarInverseBackground:                #6C737E !default;
+$navbarInverseBackgroundHighlight:       lighten($navbarInverseBackground, 10%) !default;
+$navbarInverseBorder:                    darken($navbarInverseBackground, 3%) !default;
+
+$navbarInverseText:                      $grayLight !default;
+$navbarInverseLinkColor:                 $grayLight !default;
+$navbarInverseLinkColorHover:            $white !default;
+$navbarInverseLinkColorActive:           $white !default;
+$navbarInverseLinkBackgroundHover:       transparent !default;
+$navbarInverseLinkBackgroundActive:      $navbarInverseBackground !default;
+
+$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%) !default;
+$navbarInverseSearchBackgroundFocus:     $white !default;
+$navbarInverseSearchBorder:              $navbarInverseBackground !default;
+$navbarInverseSearchPlaceholderColor:    $grayLighter !default;
+
+$navbarInverseBrandColor:                $navbarInverseLinkColor !default;
+
+
+// Buttons
+// -------------------------
+$btnBackground:                     $white !default;
+$btnBackgroundHighlight:            $grayLighter !default;
+$btnBorder:                         darken($btnBackground, 20%) !default;
+
+$btnPrimaryBackground:              lighten($linkColor, 10%) !default;
+$btnPrimaryBackgroundHighlight:     $linkColor !default;
+
+$btnInfoBackground:                 lighten(#3A5D83, 10%) !default;
+$btnInfoBackgroundHighlight:        #3A5D83 !default;
+
+$btnSuccessBackground:              lighten($green, 10%) !default;
+$btnSuccessBackgroundHighlight:     $green !default;
+
+$btnWarningBackground:              lighten($orange, 10%) !default;
+$btnWarningBackgroundHighlight:     $orange !default;
+
+$btnDangerBackground:               lighten($red, 10%) !default;
+$btnDangerBackgroundHighlight:      $red !default;
+
+$btnInverseBackground:              lighten($navbarInverseBackground, 15%) !default;
+$btnInverseBackgroundHighlight:     $navbarInverseBackground !default;
+
+
 // Pagination
 // -------------------------
 $paginationBackground:                #fff !default;

data/vendor/assets/stylesheets/bootswatch/spruce/_bootswatch.scss

@@ -1,4 +1,4 @@
-// Spruce 2.2.2
+// Spruce 2.3.0
 // Bootswatch
 // -----------------------------------------------------
 
@@ -129,6 +129,10 @@ blockquote {
 
 	.navbar-inverse {
 
+		.navbar-search .search-query {
+			color: $gray;
+		}
+
 		.dropdown-menu {
 			background-color: $navbarInverseLinkBackgroundHover;
 
@@ -145,7 +149,7 @@ blockquote {
 			}
 
 			.nav-header {
-				color: $headingsColor;
+				color: $gray;
 			}
 		}
 
@@ -182,10 +186,8 @@ blockquote {
 
 div.subnav {
 
-	background-color: $green;
-	background-image: none;
+	background: $green none;
 	border-color: transparent;
-	@include border-radius(0);
 
 	.nav > li > a {
 		padding: 12px 12px 10px;
@@ -318,7 +320,7 @@ div.subnav {
 
 	.divider {
 		background-color: transparent;
-		border-bottom: 1px solid $headingsColor;
+		border-bottom: 1px solid $grayLight;
 	}
 }
 
@@ -328,7 +330,6 @@ div.subnav {
 	background-image: none;
 	@include box-shadow(none);
 	border-color: transparent;
-	@include border-radius(0);
 
 	li {
 		color: $white;
@@ -360,7 +361,6 @@ div.subnav {
 		background-image: none;
 		@include box-shadow(none);
 		border-color: transparent;
-		@include border-radius(0);
 	}
 
 
@@ -415,7 +415,6 @@ div.subnav {
 // --------------------------------------------------
 
 .btn {
-	@include border-radius(0);
 	font-family: $headingsFontFamily;
 	font-weight: $headingsFontWeight;
     text-shadow: none;
@@ -432,25 +431,6 @@ div.subnav {
 // TABLES
 // --------------------------------------------------
 
-.table,
-.table.table-bordered,
-.table.table-striped {
-	@include border-radius(0);
-}
-
-.table-bordered thead:first-child tr:first-child th:first-child,
-.table-bordered tbody:first-child tr:first-child td:first-child,
-.table-bordered thead:first-child tr:first-child th:last-child,
-.table-bordered tbody:first-child tr:first-child td:last-child,
-.table-bordered tbody:last-child tr:last-child td:first-child, {
-	@include border-radius(0);
-}
-
-.table thead tr th:first-child,
-.table tbody tr td:first-child {
-	// border-left: none;
-}
-
 .table th,
 .table-striped tbody tr:nth-child(odd) th {
 	background-color: $green;
@@ -496,12 +476,24 @@ input, textarea, select {
 
 .form-actions {
 	border-top: none;
-	@include border-radius(4px);
+}
+
+.control-group {
+
+	&.warning,
+	&.error,
+	&.success {
+
+		.control-label {
+			color: $textColor;
+		}
+	}
 }
 
 .control-group.error {
 
-	label, .help-block, .help-inline {
+	.help-block,
+	.help-inline {
 		color: $red;
 	}
 
@@ -513,7 +505,8 @@ input, textarea, select {
 
 .control-group.success {
 
-	label, .help-block, .help-inline {
+	.help-block,
+	.help-inline {
 		color: $green;
 	}
 
@@ -525,7 +518,8 @@ input, textarea, select {
 
 .control-group.warning {
 
-	label, .help-block, .help-inline {
+	.help-block,
+	.help-inline {
 		color: $orange;
 	}
 
@@ -585,22 +579,16 @@ input, textarea, select {
 
 .well {
 	border: none;
-	@include border-radius(0);
 	@include box-shadow(none);
 }
 
 .hero-unit {
 	border: none;
-	@include border-radius(0);
 }
 
 .thumbnail {
 	border: none;
 	@include box-shadow(none);
-
-	img {
-		@include border-radius(4px);
-	}
 }
 
 .dropdown-menu .nav-header {
@@ -641,10 +629,6 @@ input, textarea, select {
 			color: $textColor;
 		}
 	}
-
-	.modal-footer {
-		@include border-radius(0 0 4px 4px);
-	}
 }
 
 .popover {

data/vendor/assets/stylesheets/bootswatch/spruce/_variables.scss

@@ -1,4 +1,4 @@
-// Spruce 2.2.2
+// Spruce 2.3.0
 // Variables
 // --------------------------------------------------
 
@@ -80,7 +80,7 @@ $borderRadiusSmall:     3px !default;
 $tableBackground:                   lighten(#ddd, 10%) !default; // overall background-color
 $tableBackgroundAccent:             lighten(#ddd, 5%) !default; // for striping
 $tableBackgroundHover:              #ddd !default; // for hover
-$tableBorder:                       $headingsColor !default; // table and cell border
+$tableBorder:                       $grayLight !default; // table and cell border
 
 // Buttons
 // -------------------------
@@ -122,7 +122,7 @@ $inputHeight:                   $baseLineHeight + 10px !default; // base line-he
 $dropdownBackground:            #002425 !default;
 $dropdownBorder:                transparent !default;
 $dropdownDividerTop:            transparent !default;
-$dropdownDividerBottom:         $black !default;
+$dropdownDividerBottom:         $grayLight !default;
 
 $dropdownLinkColor:             $white !default;
 $dropdownLinkColorHover:        $white !default;
@@ -209,7 +209,7 @@ $navbarInverseLinkBackgroundActive:      $navbarInverseLinkBackgroundHover !defa
 $navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%) !default;
 $navbarInverseSearchBackgroundFocus:     $white !default;
 $navbarInverseSearchBorder:              $navbarInverseBackground !default;
-$navbarInverseSearchPlaceholderColor:    $white !default;
+$navbarInverseSearchPlaceholderColor:    $gray !default;
 
 $navbarInverseBrandColor:                $navbarInverseLinkColor !default;
 

data/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss

@@ -1,4 +1,4 @@
-// Superhero 2.2.2
+// Superhero 2.3.0
 // Bootswatch
 // -----------------------------------------------------
 
@@ -169,52 +169,39 @@ blockquote.pull-right {
 }
 
 div.subnav {
-	background-color: $blue;
-	background-image: none;
+	margin: 0 1px;
+	background: $blue none;
 	border: none;
 
 	.nav > li > a,
 	.nav > li.active > a {
-		border-left: none;
-		border-right: none;
+		border-color: transparent;
 		color: $textColor;
 	}
 
 	.nav > li > a:hover,
 	.nav > li.active > a:hover {
 		background-color: lighten($blue, 10%);
-	}
-
-	.nav > li + li > a {
-		border-top: 0px solid transparent;
-	}
-
-	.nav > li:first-child > a,
-	.nav > li:first-child > a:hover,
-	.nav > li.active:first-child > a,
-	.nav > li.active:first-child > a:hover {
-		@include border-radius(4px 0 0 4px);
+		border-color: transparent;
 	}
 
 	.nav > li.active > a,
 	.nav > li.active > a:hover {
-		color: $white;
-		background-color: $orange;
-		background-image: none;
+		background: $orange none;
 		@include box-shadow(none);
+		color: $white;
 	}
 
 	&.subnav-fixed {
-		top: 70px;
+		top: $navbarHeight + 1;
+		margin: 0;
 		@include box-shadow(none);
 
 		.nav > li > a,
-		.nav > li.active > a,
 		.nav > li > a:hover,
+		.nav > li.active > a,
 		.nav > li.active > a:hover {
 			border-color: transparent;
-			padding-left: 12px;
-			padding-right: 12px;
 			@include border-radius(0);
 		}
 
@@ -398,11 +385,11 @@ div.subnav {
 }
 
 .btn-primary, .btn-primary:hover {
-	@include box-shadow(-2px 2px 0 darken($btnPrimaryBackground, 30%));
+	@include box-shadow(#{-2px 2px 0 darken($btnPrimaryBackground, 30%)});
 }
 
 .btn-warning, .btn-warning:hover {
-	@include box-shadow(-2px 2px 0 darken($yellow, 30%));
+	@include box-shadow(#{-2px 2px 0 darken($yellow, 30%)});
 }
 
 .btn-danger, .btn-danger:hover {
@@ -422,15 +409,15 @@ div.subnav {
 }
 
 .btn.dropdown-toggle, .btn.dropdown-toggle:hover {
-	@include box-shadow(0 2px 0 darken($white, 80%));
+	@include box-shadow(#{0 2px 0 darken($white, 80%)});
 }
 
 .btn-primary.dropdown-toggle, .btn-primary.dropdown-toggle:hover {
-	@include box-shadow(0 2px 0 darken($btnPrimaryBackground, 30%));
+	@include box-shadow(#{0 2px 0 darken($btnPrimaryBackground, 30%)});
 }
 
 .btn-warning.dropdown-toggle, .btn-warning.dropdown-toggle:hover {
-	@include box-shadow(0 2px 0 darken($yellow, 30%));
+	@include box-shadow(#{0 2px 0 darken($yellow, 30%)});
 }
 
 .btn-danger.dropdown-toggle, .btn-danger.dropdown-toggle:hover {