bootswatch-rails 0.3.2 → 0.4.0

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .rvmrc
+.ruby-version

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 0.4.0 (2013-02-22)
+
+* Update all themes to current bootswatch versions (2.3.0)
+
 ## 0.3.2 (2013-01-23)
 
 * Escape complex arguments to box-shadow in Simplex (reported @murtra)

data/README.md

@@ -85,6 +85,12 @@ Included bootswatches
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+#### Note about converter
+I am trying to automate this project as much as possible, so I wrote a script
+that does most of the work converting less to scss. If you want to contribute a
+fix that's easily automatable and you know ruby, please add a processor to the
+converter.
+
 ## Credits
 
 Big thanks to these guys.

data/converter

@@ -118,7 +118,10 @@ end
 
 line_processors = [
   swap_variable_prefix,
-  turn_percentages_into_percentiles,
+
+  # This converter doesn't seem to be actually needed
+  # turn_percentages_into_percentiles,
+
   convert_mixin_declarations,
   convert_namespace_include_syntax,
   convert_include_syntax,

data/lib/bootswatch-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootswatch
   module Rails
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

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

@@ -1,4 +1,4 @@
-// Amelia 2.2.2
+// Amelia 2.3.0
 // Bootswatch
 // -----------------------------------------------------
 
@@ -151,6 +151,11 @@ hr {
 
 	.navbar-inverse .nav-collapse {
 
+		.nav > li > a,
+		.dropdown-menu a {
+			color: $navbarInverseLinkColor !important;
+		}
+
 		.nav li > a:hover,
 		.dropdown-menu a:hover {
 			background-color: lighten($navbarInverseBackground, 10%) !important;
@@ -160,17 +165,12 @@ hr {
 
 div.subnav {
 
-	background-color: rgba(42, 99, 105, 0.9);
-	background-image: none;
-	border: 0px solid transparent;
+	margin: 0 1px;
+	background: rgba(42, 99, 105, 0.9) none;
+	border: none;
 	@include border-radius(0);
 	@include box-shadow(none);
 
-	.nav > li.open > a {
-		border-color: transparent;
-		background-color: rgba(255, 255, 255, 0.4);
-	}
-
 	.nav > li > a {
 		color: $textColor;
 		border-color: transparent;
@@ -182,28 +182,27 @@ div.subnav {
 	}
 
 	.nav > .active > a {
-		background-color: transparent;
+		background-color: rgba(255, 255, 255, 0.4);
 		border-color: transparent;
 		color: $textColor;
 		@include box-shadow(none);
 	}
 
-	.nav > .active > a:hover,
 	.nav > li > a:hover,
-	.nav > .active > a,
 	.nav > .active > a:hover, {
 		border-right-color: transparent;
 		background-color: rgba(255, 255, 255, 0.4);
 		color: $textColor;
 	}
 
-	.nav > li:first-child > a:hover {
-		border-left-color: rgba(255, 255, 255, 0.4);
-		border-left-width: 1px;
+	.nav > li.open > a {
+		border-color: transparent;
+		background-color: rgba(255, 255, 255, 0.4);
 	}
 
 	div.subnav-fixed {
-		top: 50px;
+		top: $navbarHeight + 1;
+		margin: 0;
 	}
 }
 
@@ -396,6 +395,18 @@ div.subnav {
 	@include buttonBackgroundCustom($btnBackground)
 }
 
+.btn-large {
+	padding: $paddingLarge;
+}
+
+.btn-small {
+	padding: $paddingSmall;
+}
+
+.btn-mini {
+	padding: $paddingMini;
+}
+
 .btn-group .btn:first-child {
 	margin-left: 0;
 	@include border-radius(0);
@@ -440,11 +451,6 @@ div.subnav {
 	@include buttonBackgroundCustom($btnPrimaryBackground);
 }
 
-[class^="icon-"], [class*=" icon-"] {
-	margin-top: 2px;
-	margin-right: 8px;
-}
-
 .btn-small [class^="icon-"] {
 	margin-top: 1px;
 }
@@ -520,19 +526,31 @@ input, textarea, .search-query, .uneditable-input,
 	border-top: 0px solid transparent;
 }
 
-.control-group.warning > label,
-.control-group.warning .help-inline {
-	color: lighten($orange, 30%);
+.control-group.warning {
+
+	.control-label,
+	.help-block,
+	.help-inline {
+		color: lighten($orange, 30%);
+	}
 }
 
-.control-group.error > label,
-.control-group.error .help-inline {
-	color: lighten($linkColor, 10%);
+.control-group.error {
+
+	.control-label,
+	.help-block,
+	.help-inline {
+		color: lighten($linkColor, 10%);
+	}
 }
 
-.control-group.success > label,
-.control-group.success .help-inline {
-	color: lighten($green, 20%);
+.control-group.success {
+
+	.control-label,
+	.help-block,
+	.help-inline {
+		color: lighten($green, 20%);
+	}
 }
 
 .input-prepend .add-on,
@@ -556,46 +574,45 @@ input, textarea, .search-query, .uneditable-input,
 
 .alert {
 
-	h1, h2, h3, h4, h5, h6 {
-		color: $textColor;
-	}
-}
-
-.alert, .label {
 	border-color: transparent;
 	@include border-radius(0);
 	@include box-shadow(none);
 	text-shadow: none;
-}
 
-.alert-heading {
-	color: $textColor;
-}
+	h1, h2, h3, h4, h5, h6 {
+		color: $textColor;
+	}
 
-.label, .label:hover {
-	background-color: $grayLighter;
-	text-shadow: none;
-	color: $grayDark;
+	.alert-heading {
+		color: $textColor;
+	}
 }
 
-.label-warning, .label-warning:hover, .alert {
-	background-color: $orange;
-	color: $textColor;
-}
+.label,
+.badge {
 
-.label-important, .label-important:hover, .alert-error {
-	background-color: darken($yellow, 3%);
-	color: $textColor;
-}
+	background-color: $blue;
 
-.label-success, .label-success:hover, .alert-success {
-	background-color: $green;
-	color: $textColor;
-}
+	.badge-success {
+		background-color: $green;
+	}
+
+	.badge-important {
+		background-color: $red;
+	}
+
+	.badge-warning {
+		background-color: $orange;
+	}
+
+	.badge-info {
+		background-color: $purple;
+	}
+
+	.badge-inverse {
+		background-color: $btnInverseBackground;
+	}
 
-.label-info, .label-info:hover, .alert-info {
-	background-color: $purple;
-	color: $textColor;
 }
 
 // MISCELLANEOUS
@@ -684,7 +701,7 @@ input, textarea, .search-query, .uneditable-input,
 	}
 
 	.modal-body {
-		
+
 		color: $grayDark;
 
 		h1, h2, h3, h4, h5, h6,
@@ -711,7 +728,7 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .popover {
-	
+
 	padding: 0;
 	@include border-radius(0);
 	color: $grayDark;

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

@@ -1,4 +1,4 @@
-// Amelia 2.2.2
+// Amelia 2.3.0
 // Variables
 // --------------------------------------------------
 
@@ -83,70 +83,6 @@ $tableBackgroundHover:              rgba(255, 255, 255, 0.4) !default; // for ho
 $tableBorder:                       lighten(#147E88, 12%) !default; // table and cell border
 
 
-// Navbar
-// -------------------------
-$navbarCollapseWidth:             979px !default;
-$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1 !default;
-
-$navbarHeight:                    50px !default;
-$navbarBackgroundHighlight:       $red !default;
-$navbarBackground:                $red !default;
-$navbarBorder:                    darken($navbarBackground, 12%) !default;
-
-$navbarText:                      $white !default;
-$navbarLinkColor:                 $white !default;
-$navbarLinkColorHover:            $white !default;
-$navbarLinkColorActive:           $navbarLinkColorHover !default;
-$navbarLinkBackgroundHover:       lighten($navbarBackground, 10%) !default;
-$navbarLinkBackgroundActive:      lighten($navbarBackground, 10%) !default;
-
-$navbarBrandColor:                $navbarLinkColor !default;
-
-// Inverted navbar
-$navbarInverseBackground:                $yellow !default;
-$navbarInverseBackgroundHighlight:       $yellow !default;
-$navbarInverseBorder:                    rgba(0, 0, 0, 0.1) !default;
-
-$navbarInverseText:                      $white !default;
-$navbarInverseLinkColor:                 $white !default;
-$navbarInverseLinkColorHover:            $white !default;
-$navbarInverseLinkColorActive:           $white !default;
-$navbarInverseLinkBackgroundHover:       rgba(255, 255, 255, 0.2) !default;
-$navbarInverseLinkBackgroundActive:      rgba(255, 255, 255, 0.2) !default;
-
-$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%) !default;
-$navbarInverseSearchBackgroundFocus:     $white !default;
-$navbarInverseSearchBorder:              $navbarInverseBackground !default;
-$navbarInverseSearchPlaceholderColor:    $white !default;
-
-$navbarInverseBrandColor:                $navbarInverseLinkColor !default;
-
-
-// Buttons
-// -------------------------
-$btnBackground:                     $grayLighter !default;
-$btnBackgroundHighlight:            $grayLighter !default;
-$btnBorder:                         rgba(0, 0, 0, 0) !default;
-
-$btnPrimaryBackground:              $navbarBackground !default;
-$btnPrimaryBackgroundHighlight:     $navbarBackground !default;
-
-$btnInfoBackground:                 $purple !default;
-$btnInfoBackgroundHighlight:        $purple !default;
-
-$btnSuccessBackground:              $green !default;
-$btnSuccessBackgroundHighlight:     $green !default;
-
-$btnWarningBackground:              $orange !default;
-$btnWarningBackgroundHighlight:     $orange !default;
-
-$btnDangerBackground:               $yellow !default;
-$btnDangerBackgroundHighlight:      $yellow !default;
-
-$btnInverseBackground:              #27666D !default;
-$btnInverseBackgroundHighlight:     #27666D !default;
-
-
 // Forms
 // -------------------------
 $inputBackground:               $white !default;
@@ -215,6 +151,70 @@ $horizontalComponentOffset:       180px !default;
 $wellBackground:                  #3CB9C6 !default;
 
 
+// Navbar
+// -------------------------
+$navbarCollapseWidth:             979px !default;
+$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1 !default;
+
+$navbarHeight:                    50px !default;
+$navbarBackgroundHighlight:       $red !default;
+$navbarBackground:                $red !default;
+$navbarBorder:                    darken($navbarBackground, 12%) !default;
+
+$navbarText:                      $white !default;
+$navbarLinkColor:                 $white !default;
+$navbarLinkColorHover:            $white !default;
+$navbarLinkColorActive:           $navbarLinkColorHover !default;
+$navbarLinkBackgroundHover:       lighten($navbarBackground, 10%) !default;
+$navbarLinkBackgroundActive:      lighten($navbarBackground, 10%) !default;
+
+$navbarBrandColor:                $navbarLinkColor !default;
+
+// Inverted navbar
+$navbarInverseBackground:                $yellow !default;
+$navbarInverseBackgroundHighlight:       $yellow !default;
+$navbarInverseBorder:                    rgba(0, 0, 0, 0.1) !default;
+
+$navbarInverseText:                      $white !default;
+$navbarInverseLinkColor:                 $white !default;
+$navbarInverseLinkColorHover:            $white !default;
+$navbarInverseLinkColorActive:           $white !default;
+$navbarInverseLinkBackgroundHover:       rgba(255, 255, 255, 0.2) !default;
+$navbarInverseLinkBackgroundActive:      rgba(255, 255, 255, 0.2) !default;
+
+$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%) !default;
+$navbarInverseSearchBackgroundFocus:     $white !default;
+$navbarInverseSearchBorder:              $navbarInverseBackground !default;
+$navbarInverseSearchPlaceholderColor:    $white !default;
+
+$navbarInverseBrandColor:                $navbarInverseLinkColor !default;
+
+
+// Buttons
+// -------------------------
+$btnBackground:                     $grayLighter !default;
+$btnBackgroundHighlight:            $grayLighter !default;
+$btnBorder:                         rgba(0, 0, 0, 0) !default;
+
+$btnPrimaryBackground:              $navbarBackground !default;
+$btnPrimaryBackgroundHighlight:     $navbarBackground !default;
+
+$btnInfoBackground:                 $purple !default;
+$btnInfoBackgroundHighlight:        $purple !default;
+
+$btnSuccessBackground:              $green !default;
+$btnSuccessBackgroundHighlight:     $green !default;
+
+$btnWarningBackground:              $orange !default;
+$btnWarningBackgroundHighlight:     $orange !default;
+
+$btnDangerBackground:               $yellow !default;
+$btnDangerBackgroundHighlight:      $yellow !default;
+
+$btnInverseBackground:              #27666D !default;
+$btnInverseBackgroundHighlight:     #27666D !default;
+
+
 // Pagination
 // -------------------------
 $paginationBackground:                #3CB9C6 !default;
@@ -231,20 +231,20 @@ $heroUnitLeadColor:               inherit !default;
 
 // Form states and alerts
 // -------------------------
-$warningText:             #c09853 !default;
-$warningBackground:       #fcf8e3 !default;
+$warningText:             $textColor !default;
+$warningBackground:       $orange !default;
 $warningBorder:           darken(adjust-hue($warningBackground, -10), 3%) !default;
 
-$errorText:               #b94a48 !default;
-$errorBackground:         #f2dede !default;
+$errorText:               $textColor !default;
+$errorBackground:         $red !default;
 $errorBorder:             darken(adjust-hue($errorBackground, -10), 3%) !default;
 
-$successText:             #468847 !default;
-$successBackground:       #dff0d8 !default;
+$successText:             $textColor !default;
+$successBackground:       $green !default;
 $successBorder:           darken(adjust-hue($successBackground, -10), 5%) !default;
 
-$infoText:                #3a87ad !default;
-$infoBackground:          #d9edf7 !default;
+$infoText:                $textColor !default;
+$infoBackground:          $purple !default;
 $infoBorder:              darken(adjust-hue($infoBackground, -10), 7%) !default;