Merge commit '529f8b9596556b80c9388f63b5a75b25e92af9ed'

Conflicts: lib/bootswatch-rails/version.rb
maxim · Sep 12, 2014 · 6b0aea6 · 6b0aea6
2 parents af99dec + 529f8b9
commit 6b0aea6
Show file tree

Hide file tree

Showing 37 changed files with 3,404 additions and 1,043 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,12 @@
+## 3.2.3 (2014-08-31)
+
+* Fix syntax error in Darkly and Flatly.
+
+## 3.2.2 (2014-08-30)
+
+* Add Paper theme
+* Add Sandstone theme
+
 ## 3.2.0 (2014-07-12)
 
 * Update all themes to current bootswatch versions (3.2.0)

diff --git a/README.md b/README.md
@@ -71,7 +71,9 @@ Included bootswatches
 * [Flatly](http://bootswatch.com/flatly/)
 * [Journal](http://bootswatch.com/journal/)
 * [Lumen](http://bootswatch.com/lumen/)
+* [Paper](http://bootswatch.com/paper/)
 * [Readable](http://bootswatch.com/readable/)
+* [Sandstone](http://bootswatch.com/sandstone/)
 * [Simplex](http://bootswatch.com/simplex/)
 * [Slate](http://bootswatch.com/slate/)
 * [Spacelab](http://bootswatch.com/spacelab/)

diff --git a/Rakefile b/Rakefile
@@ -10,11 +10,12 @@ THEMES = %w(
   flatly
   journal
   lumen
+  paper
   readable
+  sandstone
   simplex
   slate
   spacelab
-  spruce
   superhero
   united
   yeti

diff --git a/rearranges b/rearranges
@@ -49,7 +49,7 @@ class Variable
   end
 
   def section_name
-    section_header.split("\n").first.sub('// ', '')
+    section_header.split("\n").first.sub('//== ', '')
   end
 
   def to_s
@@ -61,16 +61,16 @@ class Variable
   end
 end
 
-Variable.sections = body.split(/(\/\/\s+\w[^\/]+\/\/\s+-+)/m)
+Variable.sections = body.split(/(\/\/==\s+\w+[\/\s]+##[\W\w]$)/m)
 
 tokens = []
 in_section = false
 
 Variable.sections.each.with_index do |section, index|
   if in_section
-    tokens[index] = section.scan(/\$\w+\s*\:?/)
+    tokens[index] = section.scan(/\$[\w-]+\s*\:?/)
     in_section = false
-  elsif section =~ /(\/\/\s+\w[^\/]+\/\/\s+-+)/m
+  elsif section =~ /(\/\/==\s+\w+[\/\s]+##[\W\w]$)/m
     tokens[index] = []
     in_section = true
   else

diff --git a/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss
@@ -186,7 +186,3 @@ a.thumbnail:focus,
 a.thumbnail.active {
   border-color: $thumbnail-border;
 }
-
-.popover {
-  color: $gray-dark;
-}
diff --git a/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss b/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss
@@ -7,9 +7,9 @@
 //
 //## Gray and brand colors for use across Bootstrap.
 
+$gray:                   lighten(#000, 33.5%) !default; // #555
 $gray-darker:            #111 !default; // #222
 $gray-dark:              #444 !default;   // #333
-$gray:                   lighten(#000, 33.5%) !default; // #555
 $gray-light:             #bbb !default;   // #999
 $gray-lighter:           #ddd !default; // #eee
 
@@ -540,7 +540,7 @@ $tooltip-arrow-color:         $tooltip-bg !default;
 //##
 
 //** Popover body background color
-$popover-bg:                          #fff !default;
+$popover-bg:                          lighten($body-bg, 5%) !default;
 //** Popover maximum width
 $popover-max-width:                   276px !default;
 //** Popover border color
@@ -554,7 +554,7 @@ $popover-title-bg:                    darken($popover-bg, 3%) !default;
 //** Popover arrow width
 $popover-arrow-width:                 10px !default;
 //** Popover arrow color
-$popover-arrow-color:                 #fff !default;
+$popover-arrow-color:                 lighten($body-bg, 5%) !default;
 
 //** Popover outer arrow width
 $popover-arrow-outer-width:           ($popover-arrow-width + 1) !default;

diff --git a/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss
@@ -7,9 +7,9 @@
 //
 //## Gray and brand colors for use across Bootstrap.
 
+$gray:                   lighten(#000, 33.5%) !default; // #555
 $gray-darker:            lighten(#000, 13.5%) !default; // #222
 $gray-dark:              lighten(#000, 20%) !default;   // #333
-$gray:                   lighten(#000, 33.5%) !default; // #555
 $gray-light:             lighten(#000, 60%) !default;   // #999
 $gray-lighter:           lighten(#000, 93.5%) !default; // #eee
 
@@ -79,31 +79,6 @@ $icon-font-name:          "glyphicons-halflings-regular" !default;
 $icon-font-svg-id:        "glyphicons_halflingsregular" !default;
 
 
-//== Type
-//
-//##
-
-//** Horizontal offset for forms and lists.
-$component-offset-horizontal: 180px !default;
-//** Text muted color
-$text-muted:                  $gray-light !default;
-//** Abbreviations and acronyms border color
-$abbr-border-color:           $gray-light !default;
-//** Headings small color
-$headings-small-color:        $gray-light !default;
-//** Blockquote small color
-$blockquote-small-color:      $gray-light !default;
-//** Blockquote font size
-$blockquote-font-size:        ($font-size-base * 1.25) !default;
-//** Blockquote border color
-$blockquote-border-color:     $gray-lighter !default;
-//** Page header border color
-$page-header-border-color:    $gray-lighter !default;
-//** Width of horizontal description list titles
-$dl-horizontal-offset:        $component-offset-horizontal !default;
-//** Horizontal line color.
-$hr-border:                   $gray-lighter !default;
-
 //== Components
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@@ -148,7 +123,7 @@ $table-cell-padding:            8px !default;
 $table-condensed-cell-padding:  5px !default;
 
 //** Default background color used for all tables.
-$table-bg:                      hsla(0, 100%, 100%, 0) !default;
+$table-bg:                      transparent !default;
 //** Background color used for `.table-striped`.
 $table-bg-accent:               #f9f9f9 !default;
 //** Background color used for `.table-hover`.
@@ -228,6 +203,30 @@ $input-group-addon-bg:           $gray-lighter !default;
 //** Border color for textual input addons
 $input-group-addon-border-color: $input-border !default;
 
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+$component-offset-horizontal: 180px !default;
+//** Text muted color
+$text-muted:                  $gray-light !default;
+//** Abbreviations and acronyms border color
+$abbr-border-color:           $gray-light !default;
+//** Headings small color
+$headings-small-color:        $gray-light !default;
+//** Blockquote small color
+$blockquote-small-color:      $gray-light !default;
+//** Blockquote font size
+$blockquote-font-size:        ($font-size-base * 1.25) !default;
+//** Blockquote border color
+$blockquote-border-color:     $gray-lighter !default;
+//** Page header border color
+$page-header-border-color:    $gray-lighter !default;
+//** Width of horizontal description list titles
+$dl-horizontal-offset:        $component-offset-horizontal !default;
+//** Horizontal line color.
+$hr-border:                   $gray-lighter !default;
 
 //== Dropdowns
 //
@@ -242,12 +241,12 @@ $dropdown-fallback-border:       #ccc !default;
 //** Divider color for between dropdown items.
 $dropdown-divider-bg:            #e5e5e5 !default;
 
+//** Active dropdown menu item background color.
+$dropdown-link-active-bg:        $component-active-bg !default;
 //** Dropdown link text color.
 $dropdown-link-color:            $gray-dark !default;
 //** Hover color for dropdown links.
 $dropdown-link-hover-color:      #fff !default;
-//** Active dropdown menu item background color.
-$dropdown-link-active-bg:        $component-active-bg !default;
 //** Hover background for dropdown links.
 $dropdown-link-hover-bg:         $dropdown-link-active-bg !default;
 
@@ -377,7 +376,7 @@ $navbar-default-link-hover-bg:             darken($navbar-default-bg, 10%) !defa
 $navbar-default-link-active-color:         #fff !default;
 $navbar-default-link-active-bg:            darken($navbar-default-bg, 10%) !default;
 $navbar-default-link-disabled-color:       #ddd !default;
-$navbar-default-link-disabled-bg:          hsla(0, 100%, 100%, 0) !default;
+$navbar-default-link-disabled-bg:          transparent !default;
 
 // Navbar brand label
 $navbar-default-brand-color:               $navbar-default-link-color !default;
@@ -403,7 +402,7 @@ $navbar-inverse-link-hover-bg:              darken($navbar-inverse-bg, 5%) !defa
 $navbar-inverse-link-active-color:          #fff !default;
 $navbar-inverse-link-active-bg:             darken($navbar-inverse-bg, 5%) !default;
 $navbar-inverse-link-disabled-color:        #ccc !default;
-$navbar-inverse-link-disabled-bg:           hsla(0, 100%, 100%, 0) !default;
+$navbar-inverse-link-disabled-bg:           transparent !default;
 
 // Inverted navbar brand label
 $navbar-inverse-brand-color:                $navbar-inverse-link-color !default;

diff --git a/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700");
+@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700");
 
 // Navbar =====================================================================
 
@@ -16,12 +16,13 @@
 
 // Buttons ====================================================================
 
-.btn-lg {
-  padding-top: 19px;
-}
 
 // Typography =================================================================
 
+body {
+  -webkit-font-smoothing: antialiased;
+}
+
 .text-primary,
 .text-primary:hover {
   color: $brand-primary;
@@ -52,7 +53,7 @@
 table,
 .table {
 
-  a {
+  a:not(.btn) {
     text-decoration: underline;
   }
 
@@ -132,27 +133,26 @@ table,
 
 // Indicators =================================================================
 
-.alert {
-  border: none;
-
-  .alert-link {
-    text-decoration: underline;
-    color: #fff;
-  }
-}
-
 .close {
-  color: #fff;
   text-decoration: none;
+  text-shadow: none;
   opacity: 0.4;
 
   &:hover,
   &:focus {
-    color: #fff;
     opacity: 1;
   }
 }
 
+.alert {
+  border: none;
+
+  .alert-link {
+    text-decoration: underline;
+    color: #fff;
+  }
+}
+
 .label {
   border-radius: 0;
 }
@@ -175,3 +175,19 @@ table,
   border-top-right-radius: 0;
   border-top-left-radius: 0;
 }
+
+.panel-default {
+  .close {
+    color: $text-color;
+  }
+}
+
+.modal {
+  .close {
+    color: $text-color;
+  }
+}
+
+.popover {
+  color: $text-color;
+}