bootstrap-sass 3.1.1.0 → 3.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e171234929f3be608f49681f95c6c7bb65b1c456
-  data.tar.gz: ce73255af32c3ef18b3f2cc91fe9034276fc5f6b
+  metadata.gz: d3f1fad60e55fbb88ef5e8a50535ccd5a05a20a4
+  data.tar.gz: e574370f0aa62a710bb5f382a7a7582f5bb01afd
 SHA512:
-  metadata.gz: 009a8ae37fa22f051a1e169a2b39f4d52a003f93642c77117cd822f63c5aaddb19f31d40182a5938d0f653516b3f74d1140abb81c31f539064204ad731ccfb6e
-  data.tar.gz: 9857469420b2454aa6fb58b6dd863f4a328ff4fdc3c553f83dd45a36192febc3da1a1519c972eff503ee06637c9517f4da4611ac474be8bdc5e13a70b08c17b4
+  metadata.gz: 73d37a1223e4b25fd3ecd6cab281255f9994afe8410982de4e13942f9168b967b5ec1d4f6ff8268a1bbf69194907f9f38d1e04725efbcea3a5bc8d2a83c5be03
+  data.tar.gz: 68ff6488249a052a596ec8cdfa0af5753ac9b2f55c16d3b3812651df5da63d2688c5674c548b5c898d6774697936680dbf2a1ef50e1b287bf99fe4eca433fe9f

data/.gitignore

@@ -12,4 +12,6 @@ Gemfile.lock
 /vendor/bundle
 tmp/
 test/screenshots/
-test/dummy/log/*.log
+test/dummy_rails/log/*.log
+
+.DS_Store

data/.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
 rvm:
+  - 2.1.1
   - 2.0.0
-  - 1.9.3
   - jruby
-  - rbx-2.2.4
+  - rbx
 gemfile:
   - test/gemfiles/sass_3_2.gemfile
+  - test/gemfiles/sass_3_3.gemfile
   - test/gemfiles/sass_head.gemfile
+before_install:
+  - "npm install node-sass mincer ejs"
 matrix:
   allow_failures:
     - gemfile: test/gemfiles/sass_head.gemfile

data/Gemfile

@@ -9,3 +9,7 @@ platform :rbx do
   gem 'racc'
 end
 
+platform :jruby do
+  gem 'test-unit'
+end
+

data/README.md

@@ -1,6 +1,4 @@
-# Bootstrap for Sass
-
-[![Build Status](https://secure.travis-ci.org/twbs/bootstrap-sass.png?branch=master)](http://travis-ci.org/twbs/bootstrap-sass)
+# Bootstrap for Sass [![Build Status](http://img.shields.io/travis/twbs/bootstrap-sass.svg)](http://travis-ci.org/twbs/bootstrap-sass)
 
 `bootstrap-sass` is a Sass-powered version of [Bootstrap](http://github.com/twbs/bootstrap), ready to drop right into your Sass powered applications.
 
@@ -15,7 +13,7 @@ Please see the appropriate guide for your environment of choice:
 In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `sass-rails` gem is present - it is added to new Rails applications by default.
 
 ```ruby
-gem 'sass-rails', '>= 3.2' # sass-rails needs to be higher than 3.2
+gem 'sass-rails', '>= 3.2'
 gem 'bootstrap-sass', '~> 3.1.1'
 ```
 
@@ -24,8 +22,9 @@ gem 'bootstrap-sass', '~> 3.1.1'
 
 #### 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`.
-
+For Rails 3.2.x, make sure bootstrap-sass is moved out of the `:assets` group.
+This is because, by default, assets group gems are not required in `production`.
+However, for pre-compilation to succeed in production, `bootstrap-sass` gem must be required.
 
 ### b. Compass without Rails
 
@@ -51,10 +50,16 @@ If you are creating a new Compass project, you can generate it with bootstrap-sa
 bundle exec compass create my-new-project -r bootstrap-sass --using bootstrap
 ```
 
+or, alternatively, if you're not using a Gemfile for your dependencies:
+
+```console
+compass create my-new-project -r bootstrap-sass --using bootstrap
+```
+
 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`.
+* [_variables.scss](/templates/project/_variables.sass.erb) - all of bootstrap variables (override them here).
+* [styles.scss](/templates/project/styles.sass) - 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.
@@ -67,20 +72,33 @@ Require the gem, and load paths and Sass helpers will be configured automaticall
 require 'bootstrap-sass'
 ```
 
-### d. Bower
+### d. Node.js / Bower
 
-Using bootstrap-sass as a Bower package is still being tested and requires libsass master. You can install it with:
+Using bootstrap-sass as a Bower package is still being tested. It is compatible with node-sass 0.8.3+. You can install it with:
 
 ```bash
-bower install git://github.com/twbs/bootstrap-sass.git
+bower install bootstrap-sass-official
 ```
 
-`bootstrap-sass` is taken so make sure you use the Git URL above.
+`bootstrap-sass` is taken so make sure you use the command above.
 
 Sass, JS, and all other assets are located at [vendor/assets](/vendor/assets).
 
-bootstrap-sass [requires](https://github.com/twbs/bootstrap-sass/issues/409) minimum [Sass number precision][sass-precision] of 10 (default is 5).
+#### Mincer
 
+If you use [mincer][mincer] with node-sass, import bootstrap into a `.css.ejs.scss` file  like so:
+
+```scss
+// Import mincer asset paths helper integration
+@import "bootstrap-mincer";
+@import "bootstrap";
+```
+
+See also this [example manifest.js](/test/dummy_node_mincer/manifest.js) for mincer.
+
+#### Number precision
+
+bootstrap-sass [requires](https://github.com/twbs/bootstrap-sass/issues/409) minimum [Sass number precision][sass-precision] of 10 (default is 5).
 
 When using ruby Sass compiler with the bower version you can enforce the limit with:
 
@@ -88,14 +106,16 @@ When using ruby Sass compiler with the bower version you can enforce the limit w
 ::Sass::Script::Number.precision = [10, ::Sass::Script::Number.precision].max
 ```
 
+Precision option is now available in libsass, but it has not made into node-sass yet.
+
 #### JS and fonts
 
-Assets are discovered automatically on Rails, Sprockets, and Compass, using native asset path helpers.
+Assets are discovered automatically on Rails, Sprockets, Compass, and Node + Mincer, using native asset path helpers.
 
 Otherwise the fonts are referenced as:
 
 ```sass
-"#{$icon-font-path}/#{$icon-font-name}.eot"
+"#{$icon-font-path}#{$icon-font-name}.eot"
 ```
 
 `$icon-font-path` defaults to `bootstrap/`.
@@ -152,7 +172,7 @@ In `application.sass`, replace `@import 'bootstrap'` with:
 
 ### Javascript
 
-We have a helper that includes all Bootstrap javascripts. If you use Rails (or Sprockets separately), 
+We have a helper that includes all Bootstrap javascripts. If you use Rails (or Sprockets separately),
 put this in your Javascript manifest (usually in `application.js`) to load the files in the [correct order](/vendor/assets/javascripts/bootstrap.js):
 
 ```js
@@ -183,12 +203,12 @@ Keeping bootstrap-sass in sync with upstream changes from Bootstrap used to be a
 Upstream changes to the Bootstrap project can now be pulled in using the `convert` rake task.
 
 Here's an example run that would pull down the master branch from the main [twbs/bootstrap](https://github.com/twbs/bootstrap) repo:
-    
+
     rake convert
-    
-This will convert the latest LESS to SASS and update to the latest JS.
+
+This will convert the latest LESS to Sass and update to the latest JS.
 To convert a specific branch or version, pass the branch name or the commit hash as the first task argument:
-    
+
     rake convert[e8a1df5f060bf7e6631554648e0abde150aedbe4]
 
 The latest converter script is located [here][converter] and does the following:
@@ -226,3 +246,4 @@ Michael Hartl's [Rails Tutorial](http://railstutorial.org/), [gitlabhq](http://g
 [antirequire]: https://github.com/twbs/bootstrap-sass/issues/79#issuecomment-4428595
 [jsdocs]: http://getbootstrap.com/javascript/#transitions
 [sass-precision]: http://sass-lang.com/documentation/Sass/Script/Number.html#precision-class_method
+[mincer]: https://github.com/nodeca/mincer

data/Rakefile

@@ -1,3 +1,5 @@
+load './tasks/bower.rake'
+
 require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << "test"
@@ -37,13 +39,14 @@ task :compile, :css_path do |t, args|
   require 'term/ansicolor'
 
   path = 'vendor/assets/stylesheets'
+  css_path = args.with_defaults(css_path: 'tmp')[:css_path]
   puts Term::ANSIColor.bold "Compiling SCSS in #{path}"
+  Dir.mkdir(css_path) unless File.directory?(css_path)
   %w(bootstrap bootstrap/_theme).each do |file|
-    save_path = "#{args.with_defaults(css_path: 'tmp')[:css_path]}/#{file.sub(/(^|\/)?_+/, '\1').sub('/', '-')}.css"
+    save_path = "#{css_path}/#{file.sub(/(^|\/)?_+/, '\1').sub('/', '-')}.css"
     puts Term::ANSIColor.cyan("  #{save_path}") + '...'
     engine    = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path])
     css       = engine.render
-    File.mkdir('tmp') unless File.directory?('tmp')
     File.open(save_path, 'w') { |f| f.write css }
   end
 end

data/bootstrap-sass.gemspec

@@ -11,17 +11,20 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/twbs/bootstrap-sass"
   s.license  = 'MIT'
 
-  s.add_development_dependency 'compass'
-  s.add_development_dependency 'term-ansicolor'
-  s.add_development_dependency 'sass-rails', '>= 3.2'
   s.add_runtime_dependency 'sass', '~> 3.2'
 
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'poltergeist'
-  s.add_development_dependency 'tzinfo'
-  s.add_development_dependency 'jquery-rails'
+  # Dummy Rails app dependencies
+  s.add_development_dependency 'sprockets-rails', '>= 2.0.1'
+  s.add_development_dependency 'jquery-rails', '>= 3.1.0'
   s.add_development_dependency 'slim-rails'
   s.add_development_dependency 'uglifier'
+  # Compass dummy app
+  s.add_development_dependency 'compass'
+  # Integration testing
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'poltergeist'
+  # Converter
+  s.add_development_dependency 'term-ansicolor'
 
   s.files      = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")

data/bower.json

@@ -9,7 +9,96 @@
     "Gleb Mazovetskiy"
   ],
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
-  "main": ["vendor/assets/stylesheets/bootstrap.scss", "vendor/assets/javascripts/bootstrap.js"],
+  "main": [
+    "vendor/assets/stylesheets/_bootstrap-mincer.scss",
+    "vendor/assets/stylesheets/bootstrap/_alerts.scss",
+    "vendor/assets/stylesheets/bootstrap/_badges.scss",
+    "vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss",
+    "vendor/assets/stylesheets/bootstrap/_button-groups.scss",
+    "vendor/assets/stylesheets/bootstrap/_buttons.scss",
+    "vendor/assets/stylesheets/bootstrap/_carousel.scss",
+    "vendor/assets/stylesheets/bootstrap/_close.scss",
+    "vendor/assets/stylesheets/bootstrap/_code.scss",
+    "vendor/assets/stylesheets/bootstrap/_component-animations.scss",
+    "vendor/assets/stylesheets/bootstrap/_dropdowns.scss",
+    "vendor/assets/stylesheets/bootstrap/_forms.scss",
+    "vendor/assets/stylesheets/bootstrap/_glyphicons.scss",
+    "vendor/assets/stylesheets/bootstrap/_grid.scss",
+    "vendor/assets/stylesheets/bootstrap/_input-groups.scss",
+    "vendor/assets/stylesheets/bootstrap/_jumbotron.scss",
+    "vendor/assets/stylesheets/bootstrap/_labels.scss",
+    "vendor/assets/stylesheets/bootstrap/_list-group.scss",
+    "vendor/assets/stylesheets/bootstrap/_media.scss",
+    "vendor/assets/stylesheets/bootstrap/_mixins.scss",
+    "vendor/assets/stylesheets/bootstrap/_modals.scss",
+    "vendor/assets/stylesheets/bootstrap/_navbar.scss",
+    "vendor/assets/stylesheets/bootstrap/_navs.scss",
+    "vendor/assets/stylesheets/bootstrap/_normalize.scss",
+    "vendor/assets/stylesheets/bootstrap/_pager.scss",
+    "vendor/assets/stylesheets/bootstrap/_pagination.scss",
+    "vendor/assets/stylesheets/bootstrap/_panels.scss",
+    "vendor/assets/stylesheets/bootstrap/_popovers.scss",
+    "vendor/assets/stylesheets/bootstrap/_print.scss",
+    "vendor/assets/stylesheets/bootstrap/_progress-bars.scss",
+    "vendor/assets/stylesheets/bootstrap/_responsive-embed.scss",
+    "vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss",
+    "vendor/assets/stylesheets/bootstrap/_scaffolding.scss",
+    "vendor/assets/stylesheets/bootstrap/_tables.scss",
+    "vendor/assets/stylesheets/bootstrap/_theme.scss",
+    "vendor/assets/stylesheets/bootstrap/_thumbnails.scss",
+    "vendor/assets/stylesheets/bootstrap/_tooltip.scss",
+    "vendor/assets/stylesheets/bootstrap/_type.scss",
+    "vendor/assets/stylesheets/bootstrap/_utilities.scss",
+    "vendor/assets/stylesheets/bootstrap/_variables.scss",
+    "vendor/assets/stylesheets/bootstrap/_wells.scss",
+    "vendor/assets/stylesheets/bootstrap/bootstrap.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_alerts.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_background-variant.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_border-radius.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_buttons.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_center-block.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_clearfix.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_forms.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_gradients.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_grid-framework.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_grid.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_hide-text.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_image.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_labels.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_list-group.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_nav-divider.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_opacity.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_pagination.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_panels.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_progress-bar.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_reset-filter.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_resize.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_size.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_tab-focus.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_table-row.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_text-overflow.scss",
+    "vendor/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss",
+    "vendor/assets/stylesheets/bootstrap.scss",
+    "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
+    "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
+    "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
+    "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
+    "vendor/assets/javascripts/bootstrap/affix.js",
+    "vendor/assets/javascripts/bootstrap/alert.js",
+    "vendor/assets/javascripts/bootstrap/button.js",
+    "vendor/assets/javascripts/bootstrap/carousel.js",
+    "vendor/assets/javascripts/bootstrap/collapse.js",
+    "vendor/assets/javascripts/bootstrap/dropdown.js",
+    "vendor/assets/javascripts/bootstrap/tab.js",
+    "vendor/assets/javascripts/bootstrap/transition.js",
+    "vendor/assets/javascripts/bootstrap/scrollspy.js",
+    "vendor/assets/javascripts/bootstrap/modal.js",
+    "vendor/assets/javascripts/bootstrap/tooltip.js",
+    "vendor/assets/javascripts/bootstrap/popover.js"
+  ],
   "keywords": [
     "twbs",
     "bootstrap",
@@ -17,6 +106,13 @@
   ],
   "license": "MIT",
   "ignore": [
-    "**/.*", "lib", "tasks", "templates", "test", "*.gemspec", "Rakefile", "Gemfile"
+    "**/.*",
+    "lib",
+    "tasks",
+    "templates",
+    "test",
+    "*.gemspec",
+    "Rakefile",
+    "Gemfile"
   ]
 }

data/lib/bootstrap-sass.rb

@@ -6,7 +6,6 @@ module Bootstrap
       register_compass_extension if compass?
 
       if rails?
-        require 'sass-rails'
         register_rails_engine
       end
 

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.1.1.0'
-  BOOTSTRAP_SHA = '385fb6898128bbfdc3def581bb92e01818fa0525'
+  VERSION = '3.1.1.1'
+  BOOTSTRAP_SHA = '573ad10a9dba52e4a6f059e63b667f4034ad2b39'
 end

data/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "bootstrap-sass",
+  "version": "3.1.1",
+  "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/twbs/bootstrap-sass"
+  },
+  "keywords": [
+    "bootstrap",
+    "sass",
+    "css"
+  ],
+  "contributors": [
+    "Thomas McDonald",
+    "Tristan Harward",
+    "Peter Gumeson",
+    "Gleb Mazovetskiy"
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/twbs/bootstrap-sass/issues"
+  }
+}

data/tasks/bower.rake

@@ -0,0 +1,33 @@
+require 'find'
+require 'bootstrap-sass'
+require 'json'
+require 'pathname'
+
+namespace :bower do
+
+  find_files = ->(path) {
+    Find.find(Pathname.new(path).relative_path_from(Pathname.new Dir.pwd).to_s).map do |path|
+      path if File.file?(path)
+    end.compact
+  }
+
+  desc 'update main and version in bower.json'
+  task :spec do
+    Dir.chdir Bootstrap.gem_path do
+      spec       = JSON.parse(File.read 'bower.json')
+      js_paths   = File.read(File.join Bootstrap.javascripts_path, 'bootstrap.js').lines.map do |line|
+        line.strip if line.sub!(%r(//\s*=\s*require\s*(.*)\s*), 'vendor/assets/javascripts/\1.js')
+      end.compact
+
+      spec['main'] = find_files.(Bootstrap.stylesheets_path) +
+          find_files.(Bootstrap.fonts_path) +
+          js_paths
+
+      spec['version'] = Bootstrap::VERSION[0..-3]
+
+      File.open('bower.json', 'w') do |f|
+        f.puts JSON.pretty_generate(spec)
+      end
+    end
+  end
+end

data/tasks/converter.rb

@@ -59,13 +59,15 @@ class Converter
 
     @save_to.each { |_, v| FileUtils.mkdir_p(v) }
 
+    process_font_assets
     process_stylesheet_assets
     process_javascript_assets
-    process_font_assets
     store_version
   end
 
   def save_file(path, content, mode='w')
+    dir = File.dirname(path)
+    FileUtils.mkdir_p(dir) unless File.directory?(dir)
     File.open(path, mode) { |file| file.write(content) }
   end
 

data/tasks/converter/less_conversion.rb

@@ -26,12 +26,12 @@ class Converter
     SCSS_MIXIN_DEF_ARGS_RE      = /[\w\-,\s$:#%()]*/
     LESS_MIXIN_DEF_ARGS_RE      = /[\w\-,;.\s@:#%()]*/
 
-    # These mixins are nested (not supported by SCSS), and need to flattened:
+    # These mixins will get vararg definitions in SCSS (not supported by LESS):
     NESTED_MIXINS               = {'#gradient' => 'gradient'}
 
     # These mixins will get vararg definitions in SCSS (not supported by LESS):
     VARARG_MIXINS               = %w(
-    transition transition-duration transition-property transition-transform box-shadow
+    scale transition transition-duration transition-property transition-transform box-shadow
   )
 
     # Convert a snippet of bootstrap LESS to Scss
@@ -45,7 +45,7 @@ class Converter
     def load_shared
       @shared_mixins ||= begin
         log_status '  Reading shared mixins from mixins.less'
-        read_mixins read_files('less', ['mixins.less'])['mixins.less'], nested: NESTED_MIXINS
+        read_mixins read_files('less', bootstrap_less_files.grep(/mixins\//)).values.join("\n"), nested: NESTED_MIXINS
       end
     end
 
@@ -59,27 +59,31 @@ class Converter
         log_processing name
         # apply common conversions
         file = convert_less(file)
+        if name.start_with?('mixins/')
+          file = varargify_mixin_definitions(file, *VARARG_MIXINS)
+          %w(responsive-(in)?visibility input-size text-emphasis-variant bg-variant).each do |mixin|
+            file = parameterize_mixin_parent_selector file, mixin if file =~ /#{mixin}/
+          end
+          NESTED_MIXINS.each do |sel, name|
+            file = flatten_mixins(file, sel, name) if /#{Regexp.escape(sel)}/ =~ file
+          end
+          file = replace_all file, /(?<=[.-])\$state/, '#{$state}' if file =~ /[.-]\$state/
+        end
         case name
-          when 'mixins.less'
-            NESTED_MIXINS.each do |selector, prefix|
-              file = flatten_mixins(file, selector, prefix)
-            end
-            file = varargify_mixin_definitions(file, *VARARG_MIXINS)
-            file = deinterpolate_vararg_mixins(file)
-            %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)
-            file = replace_all file, /(?<=[.-])\$state/, '#{$state}'
+          when 'mixins/buttons.less'
+            file = replace_all file, /(\.dropdown-toggle)&/, '&\1'
+          when 'mixins/list-group.less'
             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'
-
+          when 'mixins/gradients.less'
+            file = replace_ms_filters(file)
+            file = deinterpolate_vararg_mixins(file)
+          when 'mixins/vendor-prefixes.less'
+            # remove second scale mixins as this is handled via vararg in the first one
+            file = replace_rules(file, '.scale(@ratioX; @ratioY)') {}
+          when 'mixins/grid-framework.less'
             file = convert_grid_mixins file
+          when 'component-animations.less'
+            file = extract_nested_rule file, "#{SELECTOR_RE}&\\.in"
           when 'responsive-utilities.less'
             file = apply_mixin_parent_selector file, '\.(?:visible|hidden)'
           when 'variables.less'
@@ -104,9 +108,10 @@ class Converter
             file = replace_all file, /(\s*)\.navbar-(right|left)\s*\{\s*@extend\s*\.pull-(right|left);\s*/, "\\1.navbar-\\2 {\\1  float: \\2 !important;\\1"
           when 'tables.less'
             file = replace_all file, /(@include\s*table-row-variant\()(\w+)/, "\\1'\\2'"
-          when 'thumbnails.less'
+          when 'thumbnails.less', 'labels.less', 'badges.less'
             file = extract_nested_rule file, 'a&'
           when 'glyphicons.less'
+            file = bootstrap_font_files.map { |p| %Q(//= depend_on_asset "bootstrap/#{File.basename(p)}") } * "\n" + "\n" + file
             file = replace_all file, /\#\{(url\(.*?\))}/, '\1'
             file = replace_rules(file, '@font-face') { |rule|
               rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
@@ -119,7 +124,10 @@ class Converter
         end
 
         name    = name.sub(/\.less$/, '.scss')
-        path    = "#{save_to}/#{'_' unless name == 'bootstrap.scss'}#{name}"
+        path    = File.join save_to, name
+        unless name == 'bootstrap.scss'
+          path = File.join File.dirname(path), '_' + File.basename(path)
+        end
         save_file(path, file)
         log_processed File.basename(path)
       end
@@ -130,7 +138,9 @@ class Converter
     end
 
     def bootstrap_less_files
-      @bootstrap_less_files ||= get_paths_by_type('less', /\.less$/)
+      @bootstrap_less_files ||= get_paths_by_type('less', /\.less$/) +
+        get_paths_by_type('mixins', /\.less$/,
+                          get_tree(get_tree_sha('mixins', get_tree(get_tree_sha('less'))))).map { |p| "mixins/#{p}" }
     end
 
     # apply general less to scss conversion
@@ -138,15 +148,16 @@ class Converter
       # get local mixin names before converting the definitions
       mixins = @shared_mixins + read_mixins(file)
       file   = replace_vars(file)
-      file   = replace_file_imports(file)
       file   = replace_mixin_definitions(file)
       file   = replace_mixins(file, mixins)
       file   = replace_spin(file)
+      file   = replace_fadein(file)
       file   = replace_image_urls(file)
       file   = replace_escaping(file)
       file   = convert_less_ampersand(file)
       file   = deinterpolate_vararg_mixins(file)
       file   = replace_calculation_semantics(file)
+      file   = replace_file_imports(file)
       file
     end
 
@@ -183,7 +194,7 @@ SASS
         mixin_all_grid_columns css, selector: '.col-#{$class}-#{$i}', to: '$grid-columns'
       end
       file = replace_rules file, /@mixin calc-grid-column/ do |css|
-        css = indent css.gsub(/.*when (.*?) {/, '@if \1 {').gsub(/(?<=\$type) = (\w+)/, ' == \1').gsub(/(?<=-)(\$[a-z]+)/, '#{\1}')
+        css = indent css.gsub(/.*when (.*?) {/, '@if \1 {').gsub(/(\$[\w-]+)\s+=\s+(\w+)/, '\1 == \2').gsub(/(?<=-)(\$[a-z]+)/, '#{\1}')
         if css =~ /== width/
           css = "@mixin calc-grid-column($index, $class, $type) {\n#{css}"
         elsif css =~ /== offset/
@@ -279,7 +290,7 @@ SASS
 
     # @import "file.less" to "#{target_path}file;"
     def replace_file_imports(less, target_path = '')
-      less.gsub %r([@\$]import ["|']([\w-]+).less["|'];),
+      less.gsub %r([@\$]import ["|']([\w\-/]+).less["|'];),
                 %Q(@import "#{target_path}\\1";)
     end
 
@@ -320,15 +331,15 @@ SASS
       matches = []
       # first find the rules, and remove them
       file    = replace_rules(file, "\s*#{selector}", comments: true) { |rule, pos, css|
-        matches << [rule, pos]
-        new_selector ||= "#{get_selector(rule).gsub(/&/, selector_for_pos(css, pos.begin))}"
-        indent "// [converter] extracted #{get_selector(rule)} to #{new_selector}".tr("\n", ' ').squeeze(' '), indent_width(rule)
+        new_sel = new_selector || "#{get_selector(rule).gsub(/&/, selector_for_pos(css, pos.begin))}"
+        matches << [rule, pos, new_sel]
+        indent "// [converter] extracted #{get_selector(rule)} to #{new_sel}".tr("\n", ' ').squeeze(' '), indent_width(rule)
       }
       raise "extract_nested_rule: no such selector: #{selector}" if matches.empty?
-      log_transform selector, new_selector
       # replace rule selector with new_selector
       matches.each do |m|
-        m[0].sub! /(#{COMMENT_RE}*)^(\s*).*?(\s*){/m, "\\1\\2#{new_selector}\\3{"
+        m[0].sub! /(#{COMMENT_RE}*)^(\s*).*?(\s*){/m, "\\1\\2#{m[2]}\\3{"
+        log_transform selector, m[2]
       end
       replace_substrings_at file,
                             matches.map { |_, pos| close_brace_pos(file, pos.begin, 1) + 1 },
@@ -440,6 +451,10 @@ SASS
       less.gsub(/(?![\-$@.])spin(?!-)/, 'adjust-hue')
     end
 
+    def replace_fadein(less)
+      less.gsub(/(?![\-$@.])fadein\((.*?),\s*(.*?)%\)/) { "rgba(#{$1}, #{$2.to_i / 100.0})" }
+    end
+
     def replace_image_urls(less)
       less.gsub(/background-image: url\("?(.*?)"?\);/) { |s| replace_asset_url s, :image }
     end
@@ -488,11 +503,14 @@ SASS
     # to:
     # @mixin transition($transition...) {
     def varargify_mixin_definitions(scss, *mixins)
-      log_transform *mixins
       scss = scss.dup
+      replaced = []
       mixins.each do |mixin|
-        scss.gsub! /(@mixin\s*#{Regexp.quote(mixin)})\((#{SCSS_MIXIN_DEF_ARGS_RE})\)/, '\1(\2...)'
+        if scss.gsub! /(@mixin\s*#{Regexp.quote(mixin)})\((#{SCSS_MIXIN_DEF_ARGS_RE})\)/, '\1(\2...)'
+          replaced << mixin
+        end
       end
+      log_transform *replaced unless replaced.empty?
       scss
     end
 
@@ -511,7 +529,8 @@ SASS
 
     # get full selector for rule_block
     def get_selector(rule_block)
-      /^\s*(#{SELECTOR_RE}?)\s*\{/.match(rule_block) && $1 && $1.strip
+      sel = /^\s*(#{SELECTOR_RE}?)\s*\{/.match(rule_block) && $1 && $1.strip
+      sel.sub /\s*\{\n\s.*/m, ''
     end
 
     # replace CSS rule blocks matching rule_prefix with yield(rule_block, rule_pos)