bootswatch-rails 3.1.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d78b0e8d50d0cba15222c48be5495e7cf2708f51
-  data.tar.gz: ecf9af425a989d623a4ba7d3717a3b2d753aa349
+  metadata.gz: 4f53dbc7f1b107a85279a722b3dba59dae3b22a1
+  data.tar.gz: 7b21979c41742443cb331c39c01847c08a0c9f46
 SHA512:
-  metadata.gz: 21788dac536353c34bd1fbc0e9a6e7d92d943b84b4605825d3ddef367b9bece923875c29cae822b2865190a38e9011ed5d0370caf288efecb431d4cf25cf19ce
-  data.tar.gz: 07a437d8d882e7199e87bb3d1b8c46b4d7ce43b716a13e49f6e81d20bfcfdb2c4f4f9d3e1d809e6b8248327e89de6c214c891116992491667690952e152aed1b
+  metadata.gz: 2934f3189205785ef7b3afc9ccbd307544dcae04de07e01c29a905cacd94566ff2d10bf1336f8432a4e393fa9a9aa7122daaef924de7536553eb9771caa9c140
+  data.tar.gz: a50a44db9ddd3bded9abe7945ba9170c6d5e6293694af2436f93d7567040a9f902261d6f6d1b7f371f39fc3b8eb2549744f06c831f288b5c0ef79203b8039d19

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 3.2.0 (2014-07-12)
+
+* Update all themes to current bootswatch versions (3.2.0)
+
 ## 3.0.0 (2013-10-17)
 
 * Update all themes to current bootswatch versions (3.0.0)

data/README.md

@@ -5,7 +5,7 @@
 This gem is meant to be used with
 [bootstrap-sass](https://github.com/thomas-mcdonald/bootstrap-sass). It gives
 you complete scss versions of [bootswatches](http://bootswatch.com) for use in
-your Rails 3 asset pipeline, just like bootstrap-sass gives you scss version of
+your Rails asset pipeline, just like bootstrap-sass gives you scss version of
 bootstrap itself.
 
 ## Installation
@@ -87,14 +87,15 @@ Included bootswatches
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+Please see [CONTRIBUTING](https://github.com/maxim/bootswatch-rails/blob/master/CONTRIBUTING.md) for more detail. (Dont change the scss files by hand, use the converter and rearranger first, and make your changes in those if possible)
+
+
 #### 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.
 
-Note on 3.0.0 conversion: This was converted using a simple grunt task in the [bootswatch-scss](https://github.com/log0ymxm/bootswatch-scss) repo.
-
 ## Credits
 
 Big thanks to these guys.

data/converter

@@ -108,6 +108,14 @@ rewrite_image_paths = lambda do |line, _|
   end
 end
 
+remove_icon_font_path = lambda do |line, _|
+  if line =~ /^\s*\$icon-font-path/
+    ""
+  else 
+    line
+  end  
+end
+
 mark_variables_default = lambda do |line, _|
   if line =~ /^\s*\$/ && line.include?(':')
     line.sub(';', ' !default;')
@@ -134,6 +142,7 @@ line_processors = [
 if File.basename(src_file_path) =~ /variables/
   line_processors += [
     rewrite_image_paths,
+    remove_icon_font_path,
     mark_variables_default
   ]
 end

data/lib/bootswatch-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootswatch
   module Rails
-    VERSION = '3.1.1.1'
+    VERSION = '3.2.0'
   end
 end

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

@@ -1,4 +1,4 @@
-// Amelia 3.1.1
+// Amelia 3.2.0
 // Bootswatch
 // -----------------------------------------------------
 
@@ -95,6 +95,10 @@ legend {
   color: #fff;
 }
 
+.input-group-addon {
+  color: $btn-default-color;
+}
+
 .has-warning {
   .help-block,
   .control-label,
@@ -106,6 +110,10 @@ legend {
   .form-control:focus {
     border-color: lighten($brand-warning, 20%);
   }
+
+  .input-group-addon {
+    border: none;
+  }
 }
 
 .has-error {
@@ -119,6 +127,10 @@ legend {
   .form-control:focus {
     border-color: lighten($brand-primary, 40%);
   }
+
+  .input-group-addon {
+    border: none;
+  }
 }
 
 .has-success {
@@ -132,10 +144,10 @@ legend {
   .form-control:focus {
     border-color: lighten($brand-success, 20%);
   }
-}
 
-.input-group-addon {
-  color: $btn-default-color;
+  .input-group-addon {
+    border: none;
+  }
 }
 
 // Navs =======================================================================

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

@@ -1,7 +1,8 @@
-// Amelia 3.1.1
+// Amelia 3.2.0
 // Variables
 // --------------------------------------------------
 
+
 //== Colors
 //
 //## Gray and brand colors for use across Bootstrap.
@@ -21,7 +22,7 @@ $brand-danger:          #DF6E1E !default;
 
 //== Scaffolding
 //
-// ## Settings for some of the most global styles.
+//## Settings for some of the most global styles.
 
 //** Background color for `<body>`.
 $body-bg:               #108A93 !default;
@@ -33,15 +34,6 @@ $link-color:            lighten($brand-warning, 15%) !default;
 //** Link hover color set via `darken()` function.
 $link-hover-color:      $link-color !default;
 
-//== Miscellaneous
-//
-//##
-
-//** Horizontal line color.
-$hr-border:                   darken($body-bg, 5%) !default;
-
-//** Horizontal offset for forms and lists.
-$component-offset-horizontal: 180px !default;
 
 //== Typography
 //
@@ -76,14 +68,43 @@ $headings-line-height:    1.1 !default;
 $headings-color:          inherit !default;
 
 
-//-- Iconography
+//== Iconography
 //
-//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
-
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
 
+//** Load fonts from this directory.
+//** File name for all font files.
 $icon-font-name:          "glyphicons-halflings-regular" !default;
+//** Element ID within SVG icon file.
 $icon-font-svg-id:        "glyphicons_halflingsregular" !default;
 
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+$component-offset-horizontal: 180px !default;
+//** Text muted color
+$text-muted:                  rgba(255, 255, 255, 0.6) !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:      rgba(255, 255, 255, 0.6) !default;
+//** Blockquote font size
+$blockquote-font-size:        ($font-size-base * 1.25) !default;
+//** Blockquote border color
+$blockquote-border-color:     rgba(255, 255, 255, 0.6) !default;
+//** Page header border color
+$page-header-border-color:    darken($body-bg, 5%) !default;
+//** Width of horizontal description list titles
+$dl-horizontal-offset:        $component-offset-horizontal !default;
+//** Horizontal line color.
+$hr-border:                   darken($body-bg, 5%) !default;
+
+
+
 //== Components
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@@ -128,7 +149,7 @@ $table-cell-padding:            8px !default;
 $table-condensed-cell-padding:  5px !default;
 
 //** Default background color used for all tables.
-$table-bg:                      transparent !default;
+$table-bg:                      hsla(0, 100%, 100%, 0) !default;
 //** Background color used for `.table-striped`.
 $table-bg-accent:               darken($body-bg, 2.5%) !default;
 //** Background color used for `.table-hover`.
@@ -222,25 +243,25 @@ $dropdown-fallback-border:       #ccc !default;
 //** Divider color for between dropdown items.
 $dropdown-divider-bg:            #e5e5e5 !default;
 
-//** Active dropdown menu item text color.
-$dropdown-link-active-color:     #fff !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;
 
+//** Active dropdown menu item text color.
+$dropdown-link-active-color:     #fff !default;
+
 //** Disabled dropdown menu item background color.
 $dropdown-link-disabled-color:   $gray-lighter !default;
 
 //** Text color for headers within dropdown menus.
 $dropdown-header-color:          $gray-lighter !default;
 
-// Note: Deprecated @dropdown-caret-color as of v3.1.0
+//** Deprecated `@dropdown-caret-color` as of v3.1.0
 $dropdown-caret-color:           #000 !default;
 
 
@@ -253,8 +274,8 @@ $dropdown-caret-color:           #000 !default;
 
 $zindex-navbar:            1000 !default;
 $zindex-dropdown:          1000 !default;
-$zindex-popover:           1010 !default;
-$zindex-tooltip:           1030 !default;
+$zindex-popover:           1060 !default;
+$zindex-tooltip:           1070 !default;
 $zindex-navbar-fixed:      1030 !default;
 $zindex-modal-background:  1040 !default;
 $zindex-modal:             1050 !default;
@@ -265,27 +286,32 @@ $zindex-modal:             1050 !default;
 //## Define the breakpoints at which your layout will change, adapting to different screen sizes.
 
 // Extra small screen / phone
-// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
+//** Deprecated `@screen-xs` as of v3.0.1
 $screen-xs:                  480px !default;
+//** Deprecated `@screen-xs-min` as of v3.2.0
 $screen-xs-min:              $screen-xs !default;
+//** Deprecated `@screen-phone` as of v3.0.1
 $screen-phone:               $screen-xs-min !default;
 
 // Small screen / tablet
-// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
+//** Deprecated `@screen-sm` as of v3.0.1
 $screen-sm:                  768px !default;
 $screen-sm-min:              $screen-sm !default;
+//** Deprecated `@screen-tablet` as of v3.0.1
 $screen-tablet:              $screen-sm-min !default;
 
 // Medium screen / desktop
-// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
+//** Deprecated `@screen-md` as of v3.0.1
 $screen-md:                  992px !default;
 $screen-md-min:              $screen-md !default;
+//** Deprecated `@screen-desktop` as of v3.0.1
 $screen-desktop:             $screen-md-min !default;
 
 // Large screen / wide desktop
-// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
+//** Deprecated `@screen-lg` as of v3.0.1
 $screen-lg:                  1200px !default;
 $screen-lg-min:              $screen-lg !default;
+//** Deprecated `@screen-lg-desktop` as of v3.0.1
 $screen-lg-desktop:          $screen-lg-min !default;
 
 // So media queries don't overlap when required, provide a maximum
@@ -352,7 +378,7 @@ $navbar-default-link-hover-bg:             lighten($navbar-default-bg, 10%) !def
 $navbar-default-link-active-color:         #fff !default;
 $navbar-default-link-active-bg:            $navbar-default-link-hover-bg !default;
 $navbar-default-link-disabled-color:       #ccc !default;
-$navbar-default-link-disabled-bg:          transparent !default;
+$navbar-default-link-disabled-bg:          hsla(0, 100%, 100%, 0) !default;
 
 // Navbar brand label
 $navbar-default-brand-color:               $navbar-default-link-color !default;
@@ -378,7 +404,7 @@ $navbar-inverse-link-hover-bg:              lighten($navbar-inverse-bg, 10%) !de
 $navbar-inverse-link-active-color:          #fff !default;
 $navbar-inverse-link-active-bg:             $navbar-inverse-link-hover-bg !default;
 $navbar-inverse-link-disabled-color:        #444 !default;
-$navbar-inverse-link-disabled-bg:           transparent !default;
+$navbar-inverse-link-disabled-bg:           hsla(0, 100%, 100%, 0) !default;
 
 // Inverted navbar brand label
 $navbar-inverse-brand-color:                $navbar-inverse-link-color !default;
@@ -407,14 +433,14 @@ $nav-open-link-hover-color:                 $nav-link-hover-bg !default;
 //== Tabs
 $nav-tabs-border-color:                     $nav-link-hover-bg !default;
 
-$nav-tabs-link-hover-border-color:          transparent !default;
+$nav-tabs-link-hover-border-color:          hsla(0, 100%, 100%, 0) !default;
 
 $nav-tabs-active-link-hover-bg:             $nav-link-hover-bg !default;
 $nav-tabs-active-link-hover-color:          #fff !default;
-$nav-tabs-active-link-hover-border-color:   transparent !default;
+$nav-tabs-active-link-hover-border-color:   hsla(0, 100%, 100%, 0) !default;
 
-$nav-tabs-justified-link-border-color:            transparent !default;
-$nav-tabs-justified-active-link-border-color:     transparent !default;
+$nav-tabs-justified-link-border-color:            hsla(0, 100%, 100%, 0) !default;
+$nav-tabs-justified-active-link-border-color:     hsla(0, 100%, 100%, 0) !default;
 
 //== Pills
 $nav-pills-border-radius:                   $border-radius-base !default;
@@ -428,19 +454,19 @@ $nav-pills-active-link-hover-color:         #fff !default;
 
 $pagination-color:                     $link-color !default;
 $pagination-bg:                        lighten($body-bg, 5%) !default;
-$pagination-border:                    transparent !default;
+$pagination-border:                    hsla(0, 100%, 100%, 0) !default;
 
 $pagination-hover-color:               $link-hover-color !default;
 $pagination-hover-bg:                  $component-active-bg !default;
-$pagination-hover-border:              transparent !default;
+$pagination-hover-border:              hsla(0, 100%, 100%, 0) !default;
 
 $pagination-active-color:              #fff !default;
 $pagination-active-bg:                 lighten($body-bg, 10%) !default;
-$pagination-active-border:             transparent !default;
+$pagination-active-border:             hsla(0, 100%, 100%, 0) !default;
 
 $pagination-disabled-color:            #fff !default;
 $pagination-disabled-bg:               lighten($body-bg, 5%) !default;
-$pagination-disabled-border:           transparent !default;
+$pagination-disabled-border:           hsla(0, 100%, 100%, 0) !default;
 
 
 //== Pager
@@ -651,17 +677,26 @@ $list-group-border:             darken($body-bg, 5%) !default;
 //** List group border radius
 $list-group-border-radius:      $border-radius-base !default;
 
-//** Background color of single list elements on hover
+//** Background color of single list items on hover
 $list-group-hover-bg:           lighten($body-bg, 10%) !default;
-//** Text color of active list elements
+//** Text color of active list items
 $list-group-active-color:       $component-active-color !default;
-//** Background color of active list elements
+//** Background color of active list items
 $list-group-active-bg:          $component-active-bg !default;
 //** Border color of active list elements
 $list-group-active-border:      $list-group-border !default;
+//** Text color for content within active list items
 $list-group-active-text-color:  lighten($list-group-active-bg, 40%) !default;
 
+//** Text color of disabled list items
+$list-group-disabled-color:      $gray-light !default;
+//** Background color of disabled list items
+$list-group-disabled-bg:         $gray-lighter !default;
+//** Text color for content within disabled list items
+$list-group-disabled-text-color: $list-group-disabled-color !default;
+
 $list-group-link-color:         $link-color !default;
+$list-group-link-hover-color:   $list-group-link-color !default;
 $list-group-link-heading-color: #fff !default;
 
 
@@ -671,16 +706,18 @@ $list-group-link-heading-color: #fff !default;
 
 $panel-bg:                    lighten($body-bg, 5%) !default;
 $panel-body-padding:          15px !default;
+$panel-heading-padding:       10px 15px !default;
+$panel-footer-padding:        $panel-heading-padding !default;
 $panel-border-radius:         $border-radius-base !default;
-
-$panel-default-text:          #fff !default;
-$panel-default-border:        darken($body-bg, 5%) !default;
 $panel-default-heading-bg:    lighten($body-bg, 15%) !default;
 
 //** Border color for elements within panels
 $panel-inner-border:          darken($body-bg, 5%) !default;
 $panel-footer-bg:             $panel-default-heading-bg !default;
 
+$panel-default-text:          #fff !default;
+$panel-default-border:        darken($body-bg, 5%) !default;
+
 $panel-primary-text:          #fff !default;
 $panel-primary-border:        $brand-primary !default;
 $panel-primary-heading-bg:    $brand-primary !default;
@@ -804,23 +841,3 @@ $pre-bg:                      #f5f5f5 !default;
 $pre-color:                   $gray-dark !default;
 $pre-border-color:            #ccc !default;
 $pre-scrollable-max-height:   340px !default;
-
-
-//== Type
-//
-//##
-
-//** Text muted color
-$text-muted:                  rgba(255, 255, 255, 0.6) !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:      rgba(255, 255, 255, 0.6) !default;
-//** Blockquote font size
-$blockquote-font-size:        ($font-size-base * 1.25) !default;
-//** Blockquote border color
-$blockquote-border-color:     rgba(255, 255, 255, 0.6) !default;
-//** Page header border color
-$page-header-border-color:    darken($body-bg, 5%) !default;

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

@@ -1,4 +1,4 @@
-// Cerulean 3.1.1
+// Cerulean 3.2.0
 // Bootswatch
 // -----------------------------------------------------
 
@@ -14,11 +14,11 @@
   @include btn-shadow($navbar-default-bg);
   filter: none;
   @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.1));
-}
 
-.navbar .navbar-nav > li > a,
-.navbar-brand {
-  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
+  .navbar-nav > li > a,
+  .navbar-brand {
+    text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
+  }
 }
 
 .navbar-default {