bootstrap-sass 3.1.0.0 → 3.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b33ec25bfb1e9fa8c4e1c371a263ec79c7d40baa
-  data.tar.gz: 37ce59e8a375cf62d7f08077e8e111a60973859b
+  metadata.gz: db8d2f22db9726b88db9d2afdda3622f8e74b71b
+  data.tar.gz: 50aa39b039af948b2818c1225de73d59fcef8f73
 SHA512:
-  metadata.gz: 8052230ccd4c3069920808bd2aee510a48be09adab836da007fd8a75e9844dd4f38166bc78055c6f0424c09ab46275b141211cfb3cce49282ea3d261de22a3c9
-  data.tar.gz: 42ae1f9fb777f628e0a4e61cc2649c0c94d63f61897dfda22db87fb0b425b39ddea2aa39fdce62deb1cc74f8d6d2cb6b84bd739909c573249e5b2d1ff1aaecde
+  metadata.gz: 0184eee22fe19490d9791704521806a75c5bab053171a34e4c9a35f57199c7bf6be26d504fef7639eb7dcecff92631650a394585433b77fe908b5f44a4cc7489
+  data.tar.gz: 19a57f9892b9bf6544c69d6730025a761f5498bed546d5aceba73e6432e5c313f0ccd0982ee3bfd9ab8a85310fe1a70a691f8c3be9fec355c2bd362f79179024

data/README.md

@@ -50,6 +50,8 @@ This will create a new Compass project with the following files in it:
 * [_variables.scss](/templates/project/_variables.scss.erb) - all of bootstrap variables (override them here).
 * [styles.scss](/templates/project/styles.scss) - main project SCSS file, import `variables` and `bootstrap`.
 
+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)
 
@@ -65,6 +67,8 @@ Using bootstrap-sass as a Bower package is still being tested. You can install i
 bower install 'git://github.com/twbs/bootstrap-sass.git#v3.1.0'
 ```
 
+The files are located at [vendor/assets](/vendor/assets).
+
 #### JS and fonts
 
 If you are using Rails or Sprockets, see Usage.

data/composer.json

@@ -2,7 +2,7 @@
     "name": "twbs/bootstrap-sass",
     "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
     "keywords": ["bootstrap", "css", "sass"],
-    "homepage": "http://github.com/twbs/bootstrap",
+    "homepage": "http://github.com/twbs/bootstrap-sass",
     "authors": [
         {
             "name": "Thomas McDonald"

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.1.0.0'
-  BOOTSTRAP_SHA = '1409cde7e800ca83fd761f87e5ad8f0d259e38d1'
+  VERSION = '3.1.0.1'
+  BOOTSTRAP_SHA = '9c054fd4c0db89cbbb1df3c868bafc4f2c17c3e3'
 end

data/tasks/converter/less_conversion.rb

@@ -67,7 +67,7 @@ class Converter
             end
             file = varargify_mixin_definitions(file, *VARARG_MIXINS)
             file = deinterpolate_vararg_mixins(file)
-            %w(responsive-(in)?visibility input-size).each do |mixin|
+            %w(responsive-(in)?visibility input-size text-emphasis-variant bg-variant).each do |mixin|
               file = parameterize_mixin_parent_selector file, mixin
             end
             file = replace_ms_filters(file)
@@ -75,6 +75,11 @@ class Converter
             file = replace_rules(file, '  .list-group-item-') { |rule| extract_nested_rule rule, 'a&' }
             file = replace_all file, /,\s*\.open \.dropdown-toggle& \{(.*?)\}/m,
                                " {\\1}\n  .open & { &.dropdown-toggle {\\1} }"
+
+            # make +scale(one_argument) compatible with Sass list handling
+            # see https://github.com/twbs/bootstrap-sass/issues/518
+            file = replace_all file, '$ratio, $ratio-y', '$scale-args'
+
             file = convert_grid_mixins file
           when 'responsive-utilities.less'
             file = apply_mixin_parent_selector(file, '&\.(visible|hidden)')
@@ -110,6 +115,10 @@ class Converter
               rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
               replace_asset_url rule, :font
             }
+          when 'type.less'
+            file = apply_mixin_parent_selector(file, '\.(text|bg)-(success|primary|info|warning|danger)')
+            # .bg-primary will not get patched automatically as it includes an additional rule. fudge for now
+            file = replace_all(file, "  @include bg-variant($brand-primary);\n}", "}\n@include bg-variant('.bg-primary', $brand-primary);")
         end
 
         name    = name.sub(/\.less$/, '.scss')
@@ -138,15 +147,9 @@ class Converter
       file   = convert_less_ampersand(file)
       file   = deinterpolate_vararg_mixins(file)
       file   = replace_calculation_semantics(file)
-      file   = replace_redundant_ampersands(file)
       file
     end
 
-    # a&:hover => a:hover
-    def replace_redundant_ampersands(file)
-      file.gsub /([\w+])&([:\w]+)/, '\1\2'
-    end
-
     def replace_asset_url(rule, type)
       replace_all rule, /url\((.*?)\)/, "url(if($bootstrap-sass-asset-helper, twbs-#{type}-path(\\1), \\1))"
     end
@@ -297,7 +300,7 @@ class Converter
         # wrap properties in #{$parent} { ... }
         replace_properties(mxn_css) { |props| props.strip.empty? ? props : "  \#{#{param}} { #{props.strip} }\n  " }
         # change nested& rules to nested#{$parent}
-        replace_rules(mxn_css, /.*&[ ,]/) { |rule| replace_in_selector rule, /&/, "\#{#{param}}" }
+        replace_rules(mxn_css, /.*&[ ,:]/) { |rule| replace_in_selector rule, /&/, "\#{#{param}}" }
       end
     end
 

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

@@ -154,10 +154,10 @@
       -ms-transform: rotate($degrees); // IE9 only
           transform: rotate($degrees);
 }
-@mixin scale($ratio, $ratio-y...) {
-  -webkit-transform: scale($ratio, $ratio-y);
-      -ms-transform: scale($ratio, $ratio-y); // IE9 only
-          transform: scale($ratio, $ratio-y);
+@mixin scale($scale-args...) {
+  -webkit-transform: scale($scale-args);
+      -ms-transform: scale($scale-args); // IE9 only
+          transform: scale($scale-args);
 }
 @mixin translate($x, $y) {
   -webkit-transform: translate($x, $y);
@@ -590,18 +590,20 @@
 
 // Contextual backgrounds
 // -------------------------
-@mixin bg-variant($color) {
-  background-color: $color;
-  a:hover {
+// [converter] $parent hack
+@mixin bg-variant($parent, $color) {
+  #{$parent} { background-color: $color; }
+  a#{$parent}:hover {
     background-color: darken($color, 10%);
   }
 }
 
 // Typography
 // -------------------------
-@mixin text-emphasis-variant($color) {
-  color: $color;
-  a:hover {
+// [converter] $parent hack
+@mixin text-emphasis-variant($parent, $color) {
+  #{$parent} { color: $color; }
+  a#{$parent}:hover {
     color: darken($color, 10%);
   }
 }

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

@@ -155,7 +155,7 @@
   padding: $navbar-padding-vertical $navbar-padding-horizontal;
   font-size: $font-size-large;
   line-height: $line-height-computed;
-  height: $line-height-computed;
+  height: $navbar-height;
 
   &:hover,
   &:focus {

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

@@ -21,10 +21,7 @@
     margin-right: auto;
   }
 
-  // Add a hover state for linked versions only
-  a:hover,
-  a:focus,
-  // [converter] extracted a&.active to a.thumbnail.active
+  // [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
 
   // Image captions
   .caption {
@@ -33,6 +30,9 @@
   }
 }
 
+// Add a hover state for linked versions only
+a.thumbnail:hover,
+a.thumbnail:focus,
 a.thumbnail.active {
   border-color: $link-color;
 }

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

@@ -91,21 +91,16 @@ cite    { font-style: normal; }
 .text-muted {
   color: $text-muted;
 }
-.text-primary {
-  @include text-emphasis-variant($brand-primary);
-}
-.text-success {
-  @include text-emphasis-variant($state-success-text);
-}
-.text-info {
-  @include text-emphasis-variant($state-info-text);
-}
-.text-warning {
-  @include text-emphasis-variant($state-warning-text);
-}
-.text-danger {
-  @include text-emphasis-variant($state-danger-text);
-}
+
+@include text-emphasis-variant('.text-primary', $brand-primary);
+
+@include text-emphasis-variant('.text-success', $state-success-text);
+
+@include text-emphasis-variant('.text-info', $state-info-text);
+
+@include text-emphasis-variant('.text-warning', $state-warning-text);
+
+@include text-emphasis-variant('.text-danger', $state-danger-text);
 
 // Contextual backgrounds
 // For now we'll leave these alongside the text classes until v4 when we can
@@ -114,20 +109,16 @@ cite    { font-style: normal; }
   // Given the contrast here, this is the only class to have its color inverted
   // automatically.
   color: #fff;
-  @include bg-variant($brand-primary);
-}
-.bg-success {
-  @include bg-variant($state-success-bg);
-}
-.bg-info {
-  @include bg-variant($state-info-bg);
-}
-.bg-warning {
-  @include bg-variant($state-warning-bg);
-}
-.bg-danger {
-  @include bg-variant($state-danger-bg);
 }
+@include bg-variant('.bg-primary', $brand-primary);
+
+@include bg-variant('.bg-success', $state-success-bg);
+
+@include bg-variant('.bg-info', $state-info-bg);
+
+@include bg-variant('.bg-warning', $state-warning-bg);
+
+@include bg-variant('.bg-danger', $state-danger-bg);
 
 
 // Page header

metadata

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