bootstrap-sass 3.0.3.0 → 3.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ae9333af752fe5ef268cfe31b0552c618fdc5d4
-  data.tar.gz: 7dee8bca5ee78f5ebec85cc6874ca004c70d3ef8
+  metadata.gz: b33ec25bfb1e9fa8c4e1c371a263ec79c7d40baa
+  data.tar.gz: 37ce59e8a375cf62d7f08077e8e111a60973859b
 SHA512:
-  metadata.gz: 2180967abbf038043dba58cae99e4eb1172e800ba90f1cab21392c3cbe2645d558bf254d2d9ec7a8a042ca11dd02f25179e90b0c6be92b20d46361784387e846
-  data.tar.gz: 6f9301b6bc8add8ec58c3cd67a031ec8ffbd1a3910419c15a1fd3551e53cbefd76f7e3271fb875e232f87e693ca4ced39730c6af91140205117befabf2593e55
+  metadata.gz: 8052230ccd4c3069920808bd2aee510a48be09adab836da007fd8a75e9844dd4f38166bc78055c6f0424c09ab46275b141211cfb3cce49282ea3d261de22a3c9
+  data.tar.gz: 42ae1f9fb777f628e0a4e61cc2649c0c94d63f61897dfda22db87fb0b425b39ddea2aa39fdce62deb1cc74f8d6d2cb6b84bd739909c573249e5b2d1ff1aaecde

data/.gitignore

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

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.1.0.0
+
+* compiles with libsass master
+
 ## 3.0.2.1
 
 * fix vendor paths for compass

data/CONTRIBUTING.md

@@ -3,7 +3,7 @@
 ## Asset Changes
 
 Any changes to `bootstrap-sass` assets (scss, javascripts, fonts) should be checked against the `convert` rake task.
-For usage instructions, see the [README](https://github.com/thomas-mcdonald/bootstrap-sass/blob/3/README.md).
+For usage instructions, see the [README](https://github.com/twbs/bootstrap-sass/blob/3/README.md).
 
 If something is broken in the converter, it's preferable to update the converter along with the asset itself.
 
@@ -50,7 +50,7 @@ Example:
 > causing the bug, and potential solutions (and your opinions on their
 > merits).
 
-**[File a bug report](https://github.com/thomas-mcdonald/bootstrap-sass/issues/)**
+**[File a bug report](https://github.com/twbs/bootstrap-sass/issues/)**
 
 
 ## Pull requests

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 platform :rbx do
   gem 'rubysl', '~> 2.0'
-  gem 'rubysl-json', '~> 2.0'
+  gem 'json', '>= 1.8.1'
   gem 'rubysl-test-unit', '~> 2.0'
   gem 'racc'
 end

data/LICENSE

@@ -1,14 +1,21 @@
-Copyright 2011 Twitter, Inc.
+The MIT License (MIT)
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Copyright (c) 2013 Twitter, Inc
 
-http://www.apache.org/licenses/LICENSE-2.0
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # Bootstrap for Sass
 
-[![Build Status](https://secure.travis-ci.org/thomas-mcdonald/bootstrap-sass.png?branch=master)](http://travis-ci.org/thomas-mcdonald/bootstrap-sass) [![Code Climate](https://codeclimate.com/github/thomas-mcdonald/bootstrap-sass.png)](https://codeclimate.com/github/thomas-mcdonald/bootstrap-sass)
+[![Build Status](https://secure.travis-ci.org/twbs/bootstrap-sass.png?branch=master)](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.
 
@@ -16,7 +16,7 @@ In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `s
 
 ```ruby
 gem 'sass-rails', '>= 3.2' # sass-rails needs to be higher than 3.2
-gem 'bootstrap-sass', '~> 3.0.3.0'
+gem 'bootstrap-sass', '~> 3.1.0'
 ```
 
 `bundle install` and restart your server to make the files available through the pipeline.
@@ -59,13 +59,12 @@ Require the gem, and load paths and Sass helpers will be configured automaticall
 require 'bootstrap-sass'
 ```
 
-When using outside ruby (e.g. as a bower package), disable ruby asset lookup helper:
+Using bootstrap-sass as a Bower package is still being tested. You can install it with:
 
-```sass
-$bootstrap-sass-asset-helper: false
+```bash
+bower install 'git://github.com/twbs/bootstrap-sass.git#v3.1.0'
 ```
 
-
 #### JS and fonts
 
 If you are using Rails or Sprockets, see Usage.
@@ -112,8 +111,8 @@ You can also include optional bootstrap theme:
 @import "bootstrap/theme";
 ```
 
-The full list of bootstrap variables can be found [here](http://getbootstrap.com/customize/#less-variables). You can override these by simply redefining the variable before the `@import` directive.
-For example:
+The full list of bootstrap variables can be found [here](http://getbootstrap.com/customize/#less-variables). You can override these by simply redefining the variable before the `@import` directive, e.g.:
+
 ```scss
 $navbar-default-bg: #312312;
 $light-orange: #ff8c00;
@@ -125,18 +124,19 @@ $navbar-default-color: $light-orange;
 You can also import components explicitly. To start with a full list of modules copy this file from the gem:
 
 ```bash
-cp $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap/bootstrap.scss \
-   vendor/assets/stylesheets/bootstrap-custom.scss
+# copy and prepend "bootstrap/" to the @import paths:
+sed 's/@import "/@import "bootstrap\//' \
+ $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap/bootstrap.scss > \
+ app/assets/stylesheets/bootstrap-custom.scss
 ```
+Comment out components you do not want from `bootstrap-custom`.
 
-In your `application.sass`, replace `@import 'bootstrap'` with:
+In `application.sass`, replace `@import 'bootstrap'` with:
 
 ```scss
   @import 'bootstrap-custom';
 ```
 
-Comment out any modules you don't need from `bootstrap-custom`.
-
 ### Javascript
 
 We have a helper that includes all Bootstrap javascripts. If you use Rails (or Sprockets separately), 
@@ -207,8 +207,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/thomas-mcdonald/bootstrap-sass/blob/3/tasks/converter.rb
-[version]: https://github.com/thomas-mcdonald/bootstrap-sass/blob/3/lib/bootstrap-sass/version.rb
-[contrib]: https://github.com/thomas-mcdonald/bootstrap-sass/graphs/contributors
-[antirequire]: https://github.com/thomas-mcdonald/bootstrap-sass/issues/79#issuecomment-4428595
+[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
+[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/Rakefile

@@ -19,8 +19,13 @@ end
 desc 'Convert bootstrap to bootstrap-sass'
 task :convert, :branch do |t, args|
   require './tasks/converter'
-  branch = args[:branch]
-  Converter.new(branch).process
+  Converter.new(branch: args[:branch]).process_bootstrap
+end
+
+desc 'LESS to stdin -> Sass to stdout'
+task :less_to_scss, :branch do |t, args|
+  require './tasks/converter'
+  puts Converter.new(branch: args[:branch]).convert_less(STDIN.read)
 end
 
 desc 'Compile bootstrap-sass to tmp/ (or first arg)'

data/bootstrap-sass.gemspec

@@ -3,25 +3,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bootstrap-sass/version'
 
 Gem::Specification.new do |s|
-  s.name = "bootstrap-sass"
-  s.version = Bootstrap::VERSION
-  s.authors = ["Thomas McDonald"]
-  s.email = 'tom@conceptcoding.co.uk'
-  s.summary = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass"
-  s.homepage = "http://github.com/thomas-mcdonald/bootstrap-sass"
-  s.license = "Apache 2.0"
+  s.name     = "bootstrap-sass"
+  s.version  = Bootstrap::VERSION
+  s.authors  = ["Thomas McDonald"]
+  s.email    = 'tom@conceptcoding.co.uk'
+  s.summary  = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass"
+  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_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'
   s.add_development_dependency 'slim-rails'
+  s.add_development_dependency 'uglifier'
 
   s.files      = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")

data/bower.json

@@ -0,0 +1,22 @@
+{
+  "name": "bootstrap-sass",
+  "version": "3.1.0",
+  "homepage": "https://github.com/twbs/bootstrap-sass",
+  "authors": [
+    "Thomas McDonald",
+    "Tristan Harward",
+    "Peter Gumeson",
+    "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"],
+  "keywords": [
+    "twbs",
+    "bootstrap",
+    "sass"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*", "lib", "tasks", "templates", "test", "*.gemspec", "Rakefile", "Gemfile"
+  ]
+}

data/composer.json

@@ -0,0 +1,35 @@
+{
+    "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",
+    "authors": [
+        {
+            "name": "Thomas McDonald"
+        },
+        {
+            "name": "Tristan Harward"
+        },
+        {
+            "name": "Peter Gumeson"
+        },
+        {
+            "name": "Gleb Mazovetskiy"
+        },
+        {
+            "name": "Mark Otto"
+        },
+        {
+            "name": "Jacob Thornton"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/twbs/bootstrap-sass/issues"
+    },
+    "license": "MIT",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.1.x-dev"
+        }
+    }
+}

data/lib/bootstrap-sass.rb

@@ -1,6 +1,4 @@
 module Bootstrap
-  class FrameworkNotFound < StandardError; end
-
   class << self
     # Inspired by Kaminari
     def load!
@@ -54,7 +52,7 @@ module Bootstrap
     def configure_sass
       ::Sass.load_paths << stylesheets_path
 
-      # bootstrap requires minimum precision of 10, see https://github.com/thomas-mcdonald/bootstrap-sass/issues/409
+      # bootstrap requires minimum precision of 10, see https://github.com/twbs/bootstrap-sass/issues/409
       ::Sass::Script::Number.precision = [10, ::Sass::Script::Number.precision].max
     end
 

data/lib/bootstrap-sass/sass_functions.rb

@@ -13,17 +13,18 @@ module Sass::Script::Functions
   declare :twbs_image_path, [:source]
 
   def twbs_asset_path(source, type)
+    return Sass::Script::String.new('', :string) if source.to_s.empty?
     url = if Bootstrap.asset_pipeline? && (context = sprockets_context)
             context.send(:"#{type}_path", source.value)
           elsif Bootstrap.compass?
-            send(:"#{type}_url", source, Sass::Script::Bool.new(true)).value
+            send(:"#{type}_url", source, Sass::Script::Bool.new(true)).value.sub /url\((.*)\)$/, '\1'
           end
 
     # sass-only
     url ||= source.value.gsub('"', '')
     Sass::Script::String.new(url, :string)
   end
-  declare :twbs_asset_path, [:source]
+  declare :twbs_asset_path, [:source, :type]
 
   unless Sass::Script::Functions.instance_methods.include?(:ie_hex_str)
     # polyfill sass < 3.2.6 (taken from sass 3.2.12):
@@ -46,4 +47,4 @@ module Sass::Script::Functions
       importer.context
     end
   end
-end
+end

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.0.3.0'
-  BOOTSTRAP_SHA = '6d03173a1aad98e75f7d33e65b411c519176c59a'
+  VERSION = '3.1.0.0'
+  BOOTSTRAP_SHA = '1409cde7e800ca83fd761f87e5ad8f0d259e38d1'
 end

data/tasks/converter.rb

@@ -34,25 +34,31 @@ class Converter
   include JsConversion
   include FontsConversion
 
-  def initialize(branch)
-    @git_data_api_host = 'https://api.github.com/repos'
-    @git_raw_host  = 'https://raw.github.com'
-
-    @repo       = 'twbs/bootstrap'
-    @repo_url   = "https://github.com/#@repo"
+  def initialize(repo: 'twbs/bootstrap', branch: 'master', save_to: {}, cache_path: 'tmp/converter-cache-bootstrap')
+    @logger     = Logger.new
+    @repo       = repo
     @branch     = branch || 'master'
     @branch_sha = get_branch_sha
-    @save_at    = { js: 'vendor/assets/javascripts/bootstrap',
-                    scss: 'vendor/assets/stylesheets/bootstrap',
-                    fonts: 'vendor/assets/fonts/bootstrap' }
-    @save_at.each { |_,v| FileUtils.mkdir_p(v) }
-    @cache_path = 'tmp/converter-cache'
-    @logger     = Logger.new(repo: @repo_url, branch: @branch, branch_sha: @branch_sha, save_at: @save_at, cache_path: @cache_path)
+    @cache_path = cache_path
+    @repo_url   = "https://github.com/#@repo"
+    @save_to    = {
+        js:    'vendor/assets/javascripts/bootstrap',
+        scss:  'vendor/assets/stylesheets/bootstrap',
+        fonts: 'vendor/assets/fonts/bootstrap'}.merge(save_to)
   end
 
-  def_delegators :@logger, :log_status, :log_processing, :log_transform, :log_file_info, :log_processed, :log_http_get_file, :log_http_get_files, :silence_log
+  def_delegators :@logger, :log, :log_status, :log_processing, :log_transform, :log_file_info, :log_processed, :log_http_get_file, :log_http_get_files, :silence_log
+
+  def process_bootstrap
+    log_status "Convert Bootstrap LESS to SASS"
+    puts " repo   : #@repo_url"
+    puts " branch : #@branch_sha #@repo_url/tree/#@branch"
+    puts " save to: #{@save_to.to_json}"
+    puts " twbs cache: #{@cache_path}"
+    puts '-' * 60
+
+    @save_to.each { |_, v| FileUtils.mkdir_p(v) }
 
-  def process
     process_stylesheet_assets
     process_javascript_assets
     process_font_assets
@@ -65,7 +71,7 @@ class Converter
 
   # Update version.rb file with BOOTSTRAP_SHA
   def store_version
-    path = 'lib/bootstrap-sass/version.rb'
+    path    = 'lib/bootstrap-sass/version.rb'
     content = File.read(path).sub(/BOOTSTRAP_SHA\s*=\s*['"][\w]+['"]/, "BOOTSTRAP_SHA = '#@branch_sha'")
     File.open(path, 'w') { |f| f.write(content) }
   end

data/tasks/converter/fonts_conversion.rb

@@ -3,10 +3,14 @@ class Converter
     def process_font_assets
       log_status 'Processing fonts...'
       files   = read_files('fonts', bootstrap_font_files)
-      save_at = @save_at[:fonts]
+      save_to = @save_to[:fonts]
       files.each do |name, content|
-        save_file "#{save_at}/#{name}", content
+        save_file "#{save_to}/#{name}", content
       end
     end
+
+    def bootstrap_font_files
+      @bootstrap_font_files ||= get_paths_by_type('fonts', /\.(eot|svg|ttf|woff)$/)
+    end
   end
-end
+end

data/tasks/converter/js_conversion.rb

@@ -2,9 +2,9 @@ class Converter
   module JsConversion
     def process_javascript_assets
       log_status 'Processing javascripts...'
-      save_at = @save_at[:js]
+      save_to = @save_to[:js]
       read_files('js', bootstrap_js_files).each do |name, file|
-        save_file("#{save_at}/#{name}", file)
+        save_file("#{save_to}/#{name}", file)
       end
       log_processed "#{bootstrap_js_files * ' '}"
 
@@ -18,5 +18,22 @@ class Converter
       save_file(path, content)
       log_processed path
     end
+
+    def bootstrap_js_files
+      @bootstrap_js_files ||= begin
+        files = get_paths_by_type 'js', /\.js$/
+        files.sort_by { |f|
+          case f
+            # tooltip depends on popover and must be loaded earlier
+            when /tooltip/ then
+              1
+            when /popover/ then
+              2
+            else
+              0
+          end
+        }
+      end
+    end
   end
-end
+end

data/tasks/converter/less_conversion.rb

@@ -9,9 +9,9 @@ require_relative 'char_string_scanner'
 class Converter
   module LessConversion
     # Some regexps for matching bits of SCSS:
-    selector_char               = '\[\]$\w\-{}#,.:&>@'
+    SELECTOR_CHAR               = '\[\]$\w\-{}#,.:&>@'
     # 1 selector (the part before the {)
-    SELECTOR_RE                 = /[#{selector_char}]+[#{selector_char}\s]*/
+    SELECTOR_RE                 = /[#{SELECTOR_CHAR}]+[#{SELECTOR_CHAR}\s]*/
     # 1 // comment
     COMMENT_RE                  = %r((?:^[ \t]*//[^\n]*\n))
     # 1 {, except when part of @{ and #{
@@ -36,19 +36,30 @@ class Converter
     transition transition-duration transition-property transition-transform box-shadow
   )
 
+    # Convert a snippet of bootstrap LESS to Scss
+    def convert_less(less)
+      load_shared
+      less = convert_to_scss(less)
+      less = yield(less) if block_given?
+      less
+    end
+
+    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
+      end
+    end
+
     def process_stylesheet_assets
-      log_status "Processing stylesheets..."
+      log_status 'Processing stylesheets...'
       files = read_files('less', bootstrap_less_files)
 
-      # read common mixin definitions (incl. nested mixins) from mixins.less
-      read_shared_mixins! files['mixins.less']
-      @shared_mixins << 'make-grid'
-
-      # convert each file
+      log_status '  Converting LESS files to Scss:'
       files.each do |name, file|
         log_processing name
         # apply common conversions
-        file = convert_to_scss(file)
+        file = convert_less(file)
         case name
           when 'mixins.less'
             NESTED_MIXINS.each do |selector, prefix|
@@ -56,10 +67,12 @@ class Converter
             end
             file = varargify_mixin_definitions(file, *VARARG_MIXINS)
             file = deinterpolate_vararg_mixins(file)
-            file = parameterize_mixin_parent_selector file, 'responsive-(in)?visibility'
-            file = parameterize_mixin_parent_selector file, 'input-size'
+            %w(responsive-(in)?visibility input-size).each do |mixin|
+              file = parameterize_mixin_parent_selector file, mixin
+            end
             file = replace_ms_filters(file)
-            file = replace_all file, /\.\$state/, '.#{$state}'
+            file = replace_all file, /(?<=[.-])\$state/, '#{$state}'
+            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} }"
             file = convert_grid_mixins file
@@ -69,16 +82,19 @@ class Converter
             file = replace_rules(file, '  @media') { |r| unindent(r, 2) }
           when 'variables.less'
             file = insert_default_vars(file)
-            file = <<-SCSS + file
-// bootstrap specific variable. set to false if not using ruby + asset pipeline / compass.
-$bootstrap-sass-asset-helper: true !default;
+            file = unindent <<-SCSS + file, 14
+              // a flag to toggle asset pipeline / compass integration
+              // defaults to true if twbs-font-path function is present (no function => twbs-font-path('') parsed as string == right side)
+              // in Sass 3.3 this can be improved with: function-exists(twbs-font-path)
+              $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
             SCSS
             file = replace_all file, /(\$icon-font-path:).*(!default)/, '\1 "bootstrap/" \2'
           when 'close.less'
             # extract .close { button& {...} } rule
             file = extract_nested_rule file, 'button&'
           when 'dropdowns.less'
-            file = replace_all file, /(\s*)@extend \.pull-right-dropdown-menu;/, "\\1right: 0;\\1left: auto;"
+            file = replace_all file, /@extend \.dropdown-menu-right;/, 'right: 0; left: auto;'
+            file = replace_all file, /@extend \.dropdown-menu-left;/, 'left: 0; right: auto;'
           when 'forms.less'
             file = extract_nested_rule file, 'textarea&'
             file = apply_mixin_parent_selector(file, '\.input-(?:sm|lg)')
@@ -89,40 +105,48 @@ $bootstrap-sass-asset-helper: true !default;
           when 'thumbnails.less'
             file = extract_nested_rule file, 'a&'
           when 'glyphicons.less'
-            file  = replace_all file, /\#\{(url\(.*?\))}/, '\1'
+            file = replace_all file, /\#\{(url\(.*?\))}/, '\1'
             file = replace_rules(file, '@font-face') { |rule|
-              rule = replace_all rule, /(\$icon-font-\w+)/, '#{\1}'
+              rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
               replace_asset_url rule, :font
             }
         end
 
         name    = name.sub(/\.less$/, '.scss')
-        save_at = @save_at[:scss]
-        path    = "#{save_at}/#{'_' unless name == 'bootstrap.scss'}#{name}"
+        save_to = @save_to[:scss]
+        path    = "#{save_to}/#{'_' unless name == 'bootstrap.scss'}#{name}"
         save_file(path, file)
         log_processed File.basename(path)
       end
     end
 
+    def bootstrap_less_files
+      @bootstrap_less_files ||= get_paths_by_type('less', /\.less$/)
+    end
+
     # apply general less to scss conversion
     def convert_to_scss(file)
-      # mixins may also be defined in the file. get mixin names before doing any processing
-      mixin_names = (@shared_mixins + get_mixin_names(file)).uniq
-      file        = replace_vars(file)
-      file        = replace_file_imports(file)
-      file        = replace_mixin_definitions file
-      file        = replace_mixins file, mixin_names
-      # replace_less_extend does not seem to do anything. @glebm
-      file        = replace_less_extend(file)
-      file        = replace_spin(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)
+      # 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_image_urls(file)
+      file   = replace_escaping(file)
+      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
@@ -178,23 +202,23 @@ $bootstrap-sass-asset-helper: true !default;
     # We need to keep a list of shared mixin names in order to convert the includes correctly
     # Before doing any processing we read shared mixins from a file
     # If a mixin is nested, it gets prefixed in the list (e.g. #gradient > .horizontal to 'gradient-horizontal')
-    def read_shared_mixins!(mixins_file)
-      log_status "  Reading shared mixins from mixins.less"
-      @shared_mixins = get_mixin_names(mixins_file, silent: true)
-      NESTED_MIXINS.each do |selector, prefix|
+    def read_mixins(mixins_file, nested: {})
+      mixins = get_mixin_names(mixins_file, silent: true)
+      nested.each do |selector, prefix|
         # we use replace_rules without replacing anything just to use the parsing algorithm
         replace_rules(mixins_file, selector) { |rule|
-          @shared_mixins += get_mixin_names(unindent(unwrap_rule_block(rule)), silent: true).map { |name| "#{prefix}-#{name}" }
+          mixins += get_mixin_names(unindent(unwrap_rule_block(rule)), silent: true).map { |name| "#{prefix}-#{name}" }
           rule
         }
       end
-      @shared_mixins.sort!
-      log_file_info "shared mixins: #{@shared_mixins * ', '}"
-      @shared_mixins
+      mixins.uniq!
+      mixins.sort!
+      log_file_info "mixins: #{mixins * ', '}" unless mixins.empty?
+      mixins
     end
 
     def get_mixin_names(file, opts = {})
-      names = get_css_selectors(file).join("\n" * 2).scan(/^\.([\w-]+)\(#{LESS_MIXIN_DEF_ARGS_RE}\)[ ]*\{/).map(&:first).uniq.sort
+      names = get_css_selectors(file).join("\n" * 2).scan(/^\.([\w-]+)\(#{LESS_MIXIN_DEF_ARGS_RE}\)(?: when.*?)?[ ]*\{/).map(&:first).uniq.sort
       log_file_info "mixin defs: #{names * ', '}" unless opts[:silent] || names.empty?
       names
     end
@@ -240,7 +264,7 @@ $bootstrap-sass-asset-helper: true !default;
             prop, vals = $1, split_prop_val.call($2)
             next m unless vals.length >= 2 && vals.any? { |v| v =~ /^[\+\-]\$/ }
             transformed = vals.map { |v| v.strip =~ %r(^\(.*\)$) ? v : "(#{v})" }
-            log_transform "property #{prop}: #{transformed * ' '}"
+            log_transform "property #{prop}: #{transformed * ' '}", from: 'wrap_calculation'
             "#{prop}: #{transformed * ' '};"
           end
         end
@@ -248,7 +272,7 @@ $bootstrap-sass-asset-helper: true !default;
     end
 
     # @import "file.less" to "#{target_path}file;"
-    def replace_file_imports(less, target_path = 'bootstrap/')
+    def replace_file_imports(less, target_path = '')
       less.gsub %r([@\$]import ["|']([\w-]+).less["|'];),
                 %Q(@import "#{target_path}\\1";)
     end
@@ -266,7 +290,7 @@ $bootstrap-sass-asset-helper: true !default;
     def parameterize_mixin_parent_selector(file, rule_sel)
       log_transform rule_sel
       param = '$parent'
-      replace_rules(file, '^[ \t]*@mixin\s*' + rule_sel) do |mxn_css|
+      replace_rules(file, '^\s*@mixin\s*' + rule_sel) do |mxn_css|
         mxn_css.sub! /(?=@mixin)/, "// [converter] $parent hack\n"
         # insert param into mixin def
         mxn_css.sub!(/(@mixin [\w-]+)\(([\$\w\-,\s]*)\)/) { "#{$1}(#{param}#{', ' if $2 && !$2.empty?}#{$2})" }
@@ -309,7 +333,7 @@ $bootstrap-sass-asset-helper: true !default;
       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_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?('&')
@@ -333,13 +357,14 @@ $bootstrap-sass-asset-helper: true !default;
       end
     end
 
-    # Replaces the following:
-    #  .mixin()          -> @include mixin()
-    #  #scope > .mixin() -> @include scope-mixin()
+    # @include and @extend from LESS:
+    #  .mixin()             -> @include mixin()
+    #  #scope > .mixin()    -> @include scope-mixin()
+    #  &:extend(.mixin all) -> @include mixin()
     def replace_mixins(less, mixin_names)
       mixin_pattern = /(\s+)(([#|\.][\w-]+\s*>\s*)*)\.([\w-]+\(.*\))(?!\s\{)/
 
-      less.gsub(mixin_pattern) do |match|
+      less = less.gsub(mixin_pattern) do |match|
         matches = match.scan(mixin_pattern).flatten
         scope   = matches[1] || ''
         if scope != ''
@@ -352,6 +377,17 @@ $bootstrap-sass-asset-helper: true !default;
           "#{matches.first}@extend .#{scope}#{matches.last.gsub(/\(\)/, '')}"
         end
       end
+
+      less.gsub /&:extend\((#{SELECTOR_RE}) all\)/ do
+        selector = $1
+        selector =~ /\.([\w-]+)/
+        mixin    = $1
+        if mixin && mixin_names.include?(mixin)
+          "@include #{mixin}()"
+        else
+          "@extend #{selector}"
+        end
+      end
     end
 
     # change Microsoft filters to SASS calling convention
@@ -389,13 +425,6 @@ $bootstrap-sass-asset-helper: true !default;
       less
     end
 
-    # #gradient > .horizontal()
-    # to:
-    # @include .horizontal-gradient()
-    def replace_less_extend(less)
-      less.gsub(/\#(\w+) \> \.([\w-]*)(\(.*\));?/, '@include \1-\2\3;')
-    end
-
     def replace_spin(less)
       less.gsub(/(?![\-$@.])spin(?!-)/, 'adjust-hue')
     end
@@ -484,7 +513,7 @@ $bootstrap-sass-asset-helper: true !default;
       options = {comments: true}.merge(options || {})
       less    = less.dup
       s       = CharStringScanner.new(less)
-      rule_re = /(?:#{rule_prefix}[^{]*#{RULE_OPEN_BRACE_RE})/
+      rule_re = /(?:#{rule_prefix}[#{SELECTOR_CHAR})=(\s]*?#{RULE_OPEN_BRACE_RE})/
       if options[:comments]
         rule_start_re = /(?:#{COMMENT_RE}*)^#{rule_re}/
       else
@@ -564,7 +593,7 @@ $bootstrap-sass-asset-helper: true !default;
     # get the pos of css def at pos (search backwards)
     def css_def_pos(css, pos, depth = -1)
       to       = open_brace_pos(css, pos, depth)
-      prev_def = to - (css[0..to].reverse.index('}') || to) + 1
+      prev_def = to - (css[0..to].reverse.index(RULE_CLOSE_BRACE_RE_REVERSE) || to) + 1
       from     = prev_def + 1 + (css[prev_def + 1..-1] =~ %r(^\s*[^\s/]))
       (from..to - 1)
     end