bootstrap-sass 3.1.0.1 → 3.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db8d2f22db9726b88db9d2afdda3622f8e74b71b
-  data.tar.gz: 50aa39b039af948b2818c1225de73d59fcef8f73
+  metadata.gz: e822b0abf948cd05e02b45a362544b12b71f3fda
+  data.tar.gz: dc44d5683657e993d88af64b71340c8a81f744b0
 SHA512:
-  metadata.gz: 0184eee22fe19490d9791704521806a75c5bab053171a34e4c9a35f57199c7bf6be26d504fef7639eb7dcecff92631650a394585433b77fe908b5f44a4cc7489
-  data.tar.gz: 19a57f9892b9bf6544c69d6730025a761f5498bed546d5aceba73e6432e5c313f0ccd0982ee3bfd9ab8a85310fe1a70a691f8c3be9fec355c2bd362f79179024
+  metadata.gz: 8f2925d17495ffca305cda697f8e794b998ea1a9c60787940b3d61845cd2e2c0f1f854b140d407f4a34326e3f4bd6bdece6ab2bb647a3811d180ae0ef02f6d7c
+  data.tar.gz: 9d5ab63fc2d0d77eb155c822615770eaee61ed1b5a58bcc3ed7b8025275cec350294ee77e3b3783689602e1b1901c25f6702c6dce299b1655d922f221fbe087f

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 2.0.0
   - 1.9.3
   - jruby
-  - rbx
+  - rbx-2.2.4
 gemfile:
   - test/gemfiles/sass_3_2.gemfile
   - test/gemfiles/sass_head.gemfile

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.1.0.2
+
+Compatibility with Rails 3.2.x. Bugfixes from upstream up to 7eb532262fbd1112215b5a547b9285794b5360ab.
+
+## 3.1.0.1
+
+* bugfixes
+
 ## 3.1.0.0
 
 * compiles with libsass master

data/README.md

@@ -8,7 +8,7 @@
 
 Please see the appropriate guide for your environment of choice:
 
-### a. Rails
+### a. Ruby on Rails
 
 `bootstrap-sass` is easy to drop into Rails with the asset pipeline.
 
@@ -21,7 +21,13 @@ gem 'bootstrap-sass', '~> 3.1.0'
 
 `bundle install` and restart your server to make the files available through the pipeline.
 
-### b. Compass (no Rails)
+
+#### Rails 3.2.x
+
+For Rails 3.2.x, make sure that all the gems are moved out of the `:assets` group, and `config.assets.initialize_on_precompile` is set to `true`.
+
+
+### b. Compass without Rails
 
 Install the gem
 ```sh
@@ -53,7 +59,7 @@ This will create a new Compass project with the following files in it:
 Some bootstrap-sass mixins may conflict with the Compass ones.
 If this happens, change the import order so that Compass mixins are loaded later.
 
-### c. Sass-only (no Compass, nor Rails)
+### c. Ruby without Compass / Rails
 
 Require the gem, and load paths and Sass helpers will be configured automatically:
 
@@ -61,13 +67,17 @@ Require the gem, and load paths and Sass helpers will be configured automaticall
 require 'bootstrap-sass'
 ```
 
-Using bootstrap-sass as a Bower package is still being tested. You can install it with:
+### d. Bower
+
+Using bootstrap-sass as a Bower package is still being tested and requires libsass master. You can install it with:
 
 ```bash
-bower install 'git://github.com/twbs/bootstrap-sass.git#v3.1.0'
+bower install git://github.com/twbs/bootstrap-sass.git
 ```
 
-The files are located at [vendor/assets](/vendor/assets).
+`bootstrap-sass` is taken so make sure you use the Git URL above.
+
+Sass, JS, and all other assets are located at [vendor/assets](/vendor/assets).
 
 #### JS and fonts
 
@@ -130,7 +140,7 @@ You can also import components explicitly. To start with a full list of modules
 ```bash
 # copy and prepend "bootstrap/" to the @import paths:
 sed 's/@import "/@import "bootstrap\//' \
- $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap/bootstrap.scss > \
+ $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap.scss > \
  app/assets/stylesheets/bootstrap-custom.scss
 ```
 Comment out components you do not want from `bootstrap-custom`.
@@ -211,8 +221,8 @@ bootstrap-sass is used to build some awesome projects all over the web, includin
 Michael Hartl's [Rails Tutorial](http://railstutorial.org/), [gitlabhq](http://gitlabhq.com/) and
 [kandan](http://kandanapp.com/).
 
-[converter]: https://github.com/twbs/bootstrap-sass/blob/3/tasks/converter.rb
-[version]: https://github.com/twbs/bootstrap-sass/blob/3/lib/bootstrap-sass/version.rb
+[converter]: https://github.com/twbs/bootstrap-sass/blob/master/tasks/converter/less_conversion.rb
+[version]: https://github.com/twbs/bootstrap-sass/blob/master/lib/bootstrap-sass/version.rb
 [contrib]: https://github.com/twbs/bootstrap-sass/graphs/contributors
 [antirequire]: https://github.com/twbs/bootstrap-sass/issues/79#issuecomment-4428595
 [jsdocs]: http://getbootstrap.com/javascript/#transitions

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.1.0.1'
-  BOOTSTRAP_SHA = '9c054fd4c0db89cbbb1df3c868bafc4f2c17c3e3'
+  VERSION = '3.1.0.2'
+  BOOTSTRAP_SHA = '7eb532262fbd1112215b5a547b9285794b5360ab'
 end

data/tasks/converter/less_conversion.rb

@@ -1,11 +1,9 @@
 require_relative 'char_string_scanner'
 
-# This module transforms LESS into SCSS.
-# It is implemented via lots of string manipulation: scanning back and forwards for regexps and doing substitions.
-# Since it does not parse the LESS into an AST, bits of it may assume LESS to be formatted a certain way, and only limited,
-# static analysis can be performed. This approach has so far been mostly enough to automatically convert most all of twbs/bootstrap.
-# There is some bootstrap-specific to make up for lack of certain features in Sass 3.2 (recursion, mixin namespacing)
-# and vice versa in LESS (vararg mixins).
+# This is the script used to automatically convert all of twbs/bootstrap LESS to Sass.
+#
+# Most differences are fixed by regexps and other forms of string substitution.
+# There are Bootstrap-specific workarounds for the lack of parent selectors, recursion, mixin namespaces, extend within @media, etc in Sass 3.2.
 class Converter
   module LessConversion
     # Some regexps for matching bits of SCSS:
@@ -54,6 +52,7 @@ class Converter
     def process_stylesheet_assets
       log_status 'Processing stylesheets...'
       files = read_files('less', bootstrap_less_files)
+      save_to = @save_to[:scss]
 
       log_status '  Converting LESS files to Scss:'
       files.each do |name, file|
@@ -82,9 +81,7 @@ class Converter
 
             file = convert_grid_mixins file
           when 'responsive-utilities.less'
-            file = apply_mixin_parent_selector(file, '&\.(visible|hidden)')
-            file = apply_mixin_parent_selector(file, '(?<!&)\.(visible|hidden)')
-            file = replace_rules(file, '  @media') { |r| unindent(r, 2) }
+            file = apply_mixin_parent_selector file, '\.(?:visible|hidden)'
           when 'variables.less'
             file = insert_default_vars(file)
             file = unindent <<-SCSS + file, 14
@@ -122,11 +119,14 @@ class Converter
         end
 
         name    = name.sub(/\.less$/, '.scss')
-        save_to = @save_to[:scss]
         path    = "#{save_to}/#{'_' unless name == 'bootstrap.scss'}#{name}"
         save_file(path, file)
         log_processed File.basename(path)
       end
+
+      # generate imports valid relative to both load path and file directory
+      save_file File.expand_path("#{save_to}/../bootstrap.scss"),
+                File.read("#{save_to}/bootstrap.scss").gsub(/ "/, ' "bootstrap/')
     end
 
     def bootstrap_less_files
@@ -298,7 +298,11 @@ class Converter
         # insert param into mixin def
         mxn_css.sub!(/(@mixin [\w-]+)\(([\$\w\-,\s]*)\)/) { "#{$1}(#{param}#{', ' if $2 && !$2.empty?}#{$2})" }
         # wrap properties in #{$parent} { ... }
-        replace_properties(mxn_css) { |props| props.strip.empty? ? props : "  \#{#{param}} { #{props.strip} }\n  " }
+        replace_properties(mxn_css) { |props|
+          next props if props.strip.empty?
+          spacer = ' ' * indent_width(props)
+          "#{spacer}\#{#{param}} {\n#{indent(props.sub(/\s+\z/, ''), 2)}\n#{spacer}}"
+        }
         # change nested& rules to nested#{$parent}
         replace_rules(mxn_css, /.*&[ ,:]/) { |rule| replace_in_selector rule, /&/, "\#{#{param}}" }
       end
@@ -336,7 +340,7 @@ class Converter
       replace_rules file, '\s*' + rule_sel, comments: false do |rule, rule_pos, css|
         body = unwrap_rule_block(rule.dup).strip
         next rule unless body =~ /^@include \w+/m || body =~ /^@media/ && body =~ /\{\s*@include/
-        rule =~ /(#{COMMENT_RE}*)([#{SELECTOR_CHAR}]+?)\s*#{RULE_OPEN_BRACE_RE}/
+        rule =~ /(#{COMMENT_RE}*)([#{SELECTOR_CHAR}\s*]+?)#{RULE_OPEN_BRACE_RE}/
         cmt, sel = $1, $2.strip
         # take one up selector chain if this is an &. selector
         if sel.start_with?('&')
@@ -345,7 +349,8 @@ class Converter
         end
         # unwrap, and replace @include
         unindent unwrap_rule_block(rule).gsub(/(@include [\w-]+)\(([\$\w\-,\s]*)\)/) {
-          "#{cmt}#{$1}('#{sel}'#{', ' if $2 && !$2.empty?}#{$2})"
+          args = $2
+          "#{cmt}#{$1}('#{sel.gsub(/\s+/, ' ')}'#{', ' if args && !args.empty?}#{args})"
         }
       end
     end
@@ -570,21 +575,10 @@ class Converter
     def replace_properties(css, &block)
       s = CharStringScanner.new(css)
       s.skip_until /#{RULE_OPEN_BRACE_RE}\n?/
-      prev_pos = s.pos
-      depth    = 0
-      pos      = []
-      while (b = s.scan_next(/#{SELECTOR_RE}#{RULE_OPEN_BRACE_RE}|#{RULE_CLOSE_BRACE_RE}/m))
-        s_pos = s.pos
-        depth += (b == '}' ? -1 : +1)
-        if depth == 1
-          if b == '}'
-            prev_pos = s_pos
-          else
-            pos << (prev_pos .. s_pos - b.length - 1)
-          end
-        end
-      end
-      replace_substrings_at css, pos, &block
+      from = s.pos
+      m = s.scan_next(/\s*#{SELECTOR_RE}#{RULE_OPEN_BRACE_RE}/) || s.scan_next(/\s*#{RULE_CLOSE_BRACE_RE}/)
+      to = s.pos - m.length - 1
+      replace_substrings_at css, [(from .. to)], &block
     end
 
 

data/vendor/assets/stylesheets/bootstrap.scss

@@ -1 +1,49 @@
-@import "bootstrap/bootstrap";
+// Core variables and mixins
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+
+// Reset
+@import "bootstrap/normalize";
+@import "bootstrap/print";
+
+// Core CSS
+@import "bootstrap/scaffolding";
+@import "bootstrap/type";
+@import "bootstrap/code";
+@import "bootstrap/grid";
+@import "bootstrap/tables";
+@import "bootstrap/forms";
+@import "bootstrap/buttons";
+
+// Components
+@import "bootstrap/component-animations";
+@import "bootstrap/glyphicons";
+@import "bootstrap/dropdowns";
+@import "bootstrap/button-groups";
+@import "bootstrap/input-groups";
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+@import "bootstrap/breadcrumbs";
+@import "bootstrap/pagination";
+@import "bootstrap/pager";
+@import "bootstrap/labels";
+@import "bootstrap/badges";
+@import "bootstrap/jumbotron";
+@import "bootstrap/thumbnails";
+@import "bootstrap/alerts";
+@import "bootstrap/progress-bars";
+@import "bootstrap/media";
+@import "bootstrap/list-group";
+@import "bootstrap/panels";
+@import "bootstrap/wells";
+@import "bootstrap/close";
+
+// Components w/ JavaScript
+@import "bootstrap/modals";
+@import "bootstrap/tooltip";
+@import "bootstrap/popovers";
+@import "bootstrap/carousel";
+
+// Utility classes
+@import "bootstrap/utilities";
+@import "bootstrap/responsive-utilities";

data/vendor/assets/stylesheets/bootstrap/_mixins.scss

@@ -592,7 +592,9 @@
 // -------------------------
 // [converter] $parent hack
 @mixin bg-variant($parent, $color) {
-  #{$parent} { background-color: $color; }
+  #{$parent} {
+    background-color: $color;
+  }
   a#{$parent}:hover {
     background-color: darken($color, 10%);
   }
@@ -602,7 +604,9 @@
 // -------------------------
 // [converter] $parent hack
 @mixin text-emphasis-variant($parent, $color) {
-  #{$parent} { color: $color; }
+  #{$parent} {
+    color: $color;
+  }
   a#{$parent}:hover {
     color: darken($color, 10%);
   }
@@ -631,7 +635,9 @@
 // More easily include all the states for responsive-utilities.less.
 // [converter] $parent hack
 @mixin responsive-visibility($parent) {
-  #{$parent} { display: block !important; }
+  #{$parent} {
+    display: block !important;
+  }
   table#{$parent}  { display: table; }
   tr#{$parent}     { display: table-row !important; }
   th#{$parent},
@@ -640,10 +646,9 @@
 
 // [converter] $parent hack
 @mixin responsive-invisibility($parent) {
-    #{$parent},
-  tr#{$parent},
-  th#{$parent},
-  td#{$parent} { display: none !important; }
+  #{$parent} {
+    display: none !important;
+  }
 }
 
 
@@ -916,11 +921,14 @@
 
 // [converter] $parent hack
 @mixin input-size($parent, $input-height, $padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
-  #{$parent} { height: $input-height;
-  padding: $padding-vertical $padding-horizontal;
-  font-size: $font-size;
-  line-height: $line-height;
-  border-radius: $border-radius; }
+  #{$parent} {
+    height: $input-height;
+    padding: $padding-vertical $padding-horizontal;
+    font-size: $font-size;
+    line-height: $line-height;
+    border-radius: $border-radius;
+  }
+
   select#{$parent} {
     height: $input-height;
     line-height: $input-height;

data/vendor/assets/stylesheets/bootstrap/_modals.scss

@@ -121,7 +121,6 @@
 
 // Scale up the modal
 @media (min-width: $screen-sm-min) {
-
   // Automatically set modal's width for larger viewports
   .modal-dialog {
     width: $modal-md;
@@ -133,6 +132,8 @@
 
   // Modal sizes
   .modal-sm { width: $modal-sm; }
-  .modal-lg { width: $modal-lg; }
+}
 
+@media (min-width: $screen-md-min) {
+  .modal-lg { width: $modal-lg; }
 }

data/vendor/assets/stylesheets/bootstrap/_popovers.scss

@@ -48,7 +48,7 @@
 //
 // .arrow is outer, .arrow:after is inner
 
-.popover .arrow {
+.popover > .arrow {
   &,
   &:after {
     position: absolute;
@@ -59,16 +59,16 @@
     border-style: solid;
   }
 }
-.popover .arrow {
+.popover > .arrow {
   border-width: $popover-arrow-outer-width;
 }
-.popover .arrow:after {
+.popover > .arrow:after {
   border-width: $popover-arrow-width;
   content: "";
 }
 
 .popover {
-  &.top .arrow {
+  &.top > .arrow {
     left: 50%;
     margin-left: -$popover-arrow-outer-width;
     border-bottom-width: 0;
@@ -83,7 +83,7 @@
       border-top-color: $popover-arrow-color;
     }
   }
-  &.right .arrow {
+  &.right > .arrow {
     top: 50%;
     left: -$popover-arrow-outer-width;
     margin-top: -$popover-arrow-outer-width;
@@ -98,7 +98,7 @@
       border-right-color: $popover-arrow-color;
     }
   }
-  &.bottom .arrow {
+  &.bottom > .arrow {
     left: 50%;
     margin-left: -$popover-arrow-outer-width;
     border-top-width: 0;
@@ -114,7 +114,7 @@
     }
   }
 
-  &.left .arrow {
+  &.left > .arrow {
     top: 50%;
     right: -$popover-arrow-outer-width;
     margin-top: -$popover-arrow-outer-width;

data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss

@@ -24,26 +24,20 @@
 
 // Visibility utilities
 
-@include responsive-invisibility('.visible-xs');
+@include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg');
 
 @media (max-width: $screen-xs-max) {
   @include responsive-visibility('.visible-xs');
 }
 
-@include responsive-invisibility('.visible-sm');
-
 @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
   @include responsive-visibility('.visible-sm');
 }
 
-@include responsive-invisibility('.visible-md');
-
 @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
   @include responsive-visibility('.visible-md');
 }
 
-@include responsive-invisibility('.visible-lg');
-
 @media (min-width: $screen-lg-min) {
   @include responsive-visibility('.visible-lg');
 }

data/vendor/assets/stylesheets/bootstrap/_variables.scss

@@ -78,7 +78,7 @@ $headings-color:          inherit !default;
 
 $icon-font-path: "bootstrap/" !default;
 $icon-font-name:          "glyphicons-halflings-regular" !default;
-$icon-font-svg-id:				"glyphicons_halflingsregular" !default;
+$icon-font-svg-id:        "glyphicons_halflingsregular" !default;
 
 //== Components
 //

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 3.1.0.1
+  version: 3.1.0.2
 platform: ruby
 authors:
 - Thomas McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass