bootstrap 4.0.0.alpha1 → 4.0.0.alpha2

data/assets/stylesheets/bootstrap/mixins/_background-variant.scss

@@ -2,8 +2,8 @@
 
 @mixin bg-variant($parent, $color) {
   #{$parent} {
-    color: #fff;
-    background-color: $color;
+    color: #fff !important;
+    background-color: $color !important;
   }
   a#{$parent} {
     @include hover-focus {

data/assets/stylesheets/bootstrap/mixins/_breakpoints.scss

@@ -74,3 +74,13 @@
     }
   }
 }
+
+// Media that spans multiple breakpoint widths.
+// Makes the @content apply between the min and max breakpoints
+@mixin media-breakpoint-between($lower, $upper, $breakpoints: $grid-breakpoints) {
+  @include media-breakpoint-up($lower, $breakpoints) {
+    @include media-breakpoint-down($upper, $breakpoints) {
+      @content;
+    }
+  }
+}

data/assets/stylesheets/bootstrap/mixins/_forms.scss

@@ -5,7 +5,7 @@
 
 @mixin form-control-validation($color) {
   // Color the label and help text
-  .help-block,
+  .text-help,
   .form-control-label,
   .radio,
   .checkbox,

data/assets/stylesheets/bootstrap/mixins/_image.scss

@@ -21,12 +21,13 @@
 @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
   background-image: url($file-1x);
 
+  // Autoprefixer takes care of adding -webkit-min-device-pixel-ratio and -o-min-device-pixel-ratio,
+  // but doesn't convert dppx=>dpi.
+  // There's no such thing as unprefixed min-device-pixel-ratio since it's nonstandard.
+  // Compatibility info: http://caniuse.com/#feat=css-media-resolution
   @media
-  only screen and (-webkit-min-device-pixel-ratio: 2),
-  only screen and (     -o-min-device-pixel-ratio: 2/1),
-  only screen and (        min-device-pixel-ratio: 2),
-  only screen and (                min-resolution: 192dpi),
-  only screen and (                min-resolution: 2dppx) {
+  only screen and (min-resolution: 192dpi), // IE9-11 don't support dppx
+  only screen and (min-resolution: 2dppx) { // Standardized
     background-image: url($file-2x);
     background-size: $width-1x $height-1x;
   }

data/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss

@@ -2,7 +2,7 @@
 
 @mixin text-emphasis-variant($parent, $color) {
   #{$parent} {
-    color: $color;
+    color: $color !important;
   }
   a#{$parent} {
     @include hover-focus {

data/lib/bootstrap.rb

@@ -7,6 +7,8 @@ module Bootstrap
 
       if rails?
         register_rails_engine
+      elsif lotus?
+        register_lotus
       elsif sprockets?
         register_sprockets
       end
@@ -44,6 +46,10 @@ module Bootstrap
       defined?(::Rails)
     end
 
+    def lotus?
+      defined?(::Lotus)
+    end
+
     private
 
     def configure_sass
@@ -70,6 +76,10 @@ module Bootstrap
       Sprockets.append_path(stylesheets_path)
       Sprockets.append_path(javascripts_path)
     end
+
+    def register_lotus
+      Lotus::Assets.sources << assets_path
+    end
   end
 end
 

data/lib/bootstrap/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '4.0.0.alpha1'
-  BOOTSTRAP_SHA = '43b130022b333c25d9fa810ab2666059ed699f7a'
+  VERSION       = '4.0.0.alpha2'
+  BOOTSTRAP_SHA = '4d92e2c7ec600d07d4dceb2e9c83d9bcf0ba9268'
 end

data/tasks/updater/js.rb

@@ -5,7 +5,10 @@ class Updater
       save_to  = @save_to[:js]
       contents = {}
       read_files('js/dist', bootstrap_js_files).each do |name, file|
-        contents[name] = file
+        contents[name] = file.
+            # Remove the source mapping URL comment as this gem does not bundle source maps.
+            sub!(%r(^//# sourceMappingURL=#{name}.map\n\z), '') or
+            fail "Cannot find source mapping URL to remove in #{name}. Last line: #{file.lines.last.inspect}"
         save_file("#{save_to}/#{name}", file)
       end
       log_processed "#{bootstrap_js_files * ' '}"

data/templates/project/_bootstrap-variables.scss

@@ -135,7 +135,7 @@
 
 // $font-size-base:             1rem;
 // $font-size-lg:               1.25rem;
-// $font-size-sm:               .85rem;
+// $font-size-sm:               .875rem;
 // $font-size-xs:               .75rem;
 
 // $font-size-h1:               2.5rem;
@@ -296,9 +296,9 @@
 // $cursor-disabled:                not-allowed;
 
 // Form validation icons
-// $form-icon-success: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNoZWNrIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiM1Q0I4NUMiIGQ9Ik0yMzMuOCw2MTAuMWMtMTMuMywwLTI1LjktNi4yLTM0LTE2LjlMOTAuNSw0NDguOEM3Ni4zLDQzMCw4MCw0MDMuMyw5OC44LDM4OS4xYzE4LjgtMTQuMyw0NS41LTEwLjUsNTkuOCw4LjNsNzEuOSw5NWwyMjAuOS0yNTAuNWMxMi41LTIwLDM4LjgtMjYuMSw1OC44LTEzLjZjMjAsMTIuNCwyNi4xLDM4LjcsMTMuNiw1OC44TDI3MCw1OTBjLTcuNCwxMi0yMC4yLDE5LjQtMzQuMywyMC4xQzIzNS4xLDYxMC4xLDIzNC41LDYxMC4xLDIzMy44LDYxMC4xeiIvPjwvc3ZnPg==";
-// $form-icon-warning: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9Ildhcm5pbmciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNjEyIDc5MiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjEyIDc5MiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0iI0YwQUQ0RSIgZD0iTTYwMyw2NDAuMmwtMjc4LjUtNTA5Yy0zLjgtNi42LTEwLjgtMTAuNi0xOC41LTEwLjZzLTE0LjcsNC4xLTE4LjUsMTAuNkw5LDY0MC4yYy0zLjcsNi41LTMuNiwxNC40LDAuMiwyMC44YzMuOCw2LjUsMTAuOCwxMC40LDE4LjMsMTAuNGg1NTcuMWM3LjUsMCwxNC41LTMuOSwxOC4zLTEwLjRDNjA2LjYsNjU0LjYsNjA2LjcsNjQ2LjYsNjAzLDY0MC4yeiBNMzM2LjYsNjEwLjJoLTYxLjJWNTQ5aDYxLjJWNjEwLjJ6IE0zMzYuNiw1MDMuMWgtNjEuMlYzMDQuMmg2MS4yVjUwMy4xeiIvPjwvc3ZnPg==";
-// $form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNyb3NzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiNEOTUzNEYiIGQ9Ik00NDcsNTQ0LjRjLTE0LjQsMTQuNC0zNy42LDE0LjQtNTEuOSwwTDMwNiw0NTEuN2wtODkuMSw5Mi43Yy0xNC40LDE0LjQtMzcuNiwxNC40LTUxLjksMGMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlsOTIuNC05Ni40TDE2NSwyOTkuNmMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlzMzcuNi0xNC40LDUxLjksMGw4OS4yLDkyLjdsODkuMS05Mi43YzE0LjQtMTQuNCwzNy42LTE0LjQsNTEuOSwwYzE0LjQsMTQuNCwxNC40LDM3LjYsMCw1MS45TDM1NC43LDM5Nmw5Mi40LDk2LjRDNDYxLjQsNTA2LjgsNDYxLjQsNTMwLDQ0Nyw1NDQuNHoiLz48L3N2Zz4=";
+// $form-icon-success: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjNWNiODVjIiBkPSJNMjMzLjggNjEwYy0xMy4zIDAtMjYtNi0zNC0xNi44TDkwLjUgNDQ4LjhDNzYuMyA0MzAgODAgNDAzLjMgOTguOCAzODljMTguOC0xNC4yIDQ1LjUtMTAuNCA1OS44IDguNGw3MiA5NUw0NTEuMyAyNDJjMTIuNS0yMCAzOC44LTI2LjIgNTguOC0xMy43IDIwIDEyLjQgMjYgMzguNyAxMy43IDU4LjhMMjcwIDU5MGMtNy40IDEyLTIwLjIgMTkuNC0zNC4zIDIwaC0yeiIvPjwvc3ZnPg==";
+// $form-icon-warning: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjZjBhZDRlIiBkPSJNNjAzIDY0MC4ybC0yNzguNS01MDljLTMuOC02LjYtMTAuOC0xMC42LTE4LjUtMTAuNnMtMTQuNyA0LTE4LjUgMTAuNkw5IDY0MC4yYy0zLjcgNi41LTMuNiAxNC40LjIgMjAuOCAzLjggNi41IDEwLjggMTAuNCAxOC4zIDEwLjRoNTU3YzcuNiAwIDE0LjYtNCAxOC40LTEwLjQgMy41LTYuNCAzLjYtMTQuNCAwLTIwLjh6bS0yNjYuNC0zMGgtNjEuMlY1NDloNjEuMnY2MS4yem0wLTEwN2gtNjEuMlYzMDRoNjEuMnYxOTl6Ii8+PC9zdmc+";
+// $form-icon-danger: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjZDk1MzRmIiBkPSJNNDQ3IDU0NC40Yy0xNC40IDE0LjQtMzcuNiAxNC40LTUyIDBsLTg5LTkyLjctODkgOTIuN2MtMTQuNSAxNC40LTM3LjcgMTQuNC01MiAwLTE0LjQtMTQuNC0xNC40LTM3LjYgMC01Mmw5Mi40LTk2LjMtOTIuNC05Ni4zYy0xNC40LTE0LjQtMTQuNC0zNy42IDAtNTJzMzcuNi0xNC4zIDUyIDBsODkgOTIuOCA4OS4yLTkyLjdjMTQuNC0xNC40IDM3LjYtMTQuNCA1MiAwIDE0LjMgMTQuNCAxNC4zIDM3LjYgMCA1MkwzNTQuNiAzOTZsOTIuNCA5Ni40YzE0LjQgMTQuNCAxNC40IDM3LjYgMCA1MnoiLz48L3N2Zz4=";
 
 
 // Dropdowns
@@ -457,6 +457,9 @@
 // $card-cap-bg:              #f5f5f5;
 // $card-bg:                  #fff;
 
+// $card-link-hover-color:    #fff;
+
+
 // Tooltips
 
 // $tooltip-max-width:           200px;
@@ -473,7 +476,6 @@
 // $popover-bg:                          #fff;
 // $popover-max-width:                   276px;
 // $popover-border-color:                rgba(0,0,0,.2);
-// $popover-fallback-border-color:       #ccc;
 
 // $popover-title-bg:                    darken($popover-bg, 3%);
 
@@ -482,7 +484,6 @@
 
 // $popover-arrow-outer-width:           ($popover-arrow-width + 1);
 // $popover-arrow-outer-color:           fade-in($popover-border-color, 0.05);
-// $popover-arrow-outer-fallback-color:  darken($popover-fallback-border-color, 20%);
 
 
 // Labels
@@ -526,6 +527,7 @@
 // $alert-padding:               15px;
 // $alert-border-radius:         $border-radius;
 // $alert-link-font-weight:      bold;
+// $alert-border-width:          $border-width;
 
 // $alert-success-bg:            $state-success-bg;
 // $alert-success-text:          $state-success-text;

data/test/dummy_rails/app/assets/stylesheets/application.sass

@@ -1 +1,4 @@
 @import 'bootstrap'
+
+.test-mixin
+  +make-container

data/test/dummy_rails/config/application.rb

@@ -22,7 +22,10 @@ require 'rails-assets-tether'
 module Dummy
   class Application < Rails::Application
     config.assets.enabled = true if config.assets.respond_to?(:enabled)
-    config.assets.precompile += %w( application.css application.js )
+    if Rails::VERSION::MAJOR > 4
+      # Rails 4 precompiles application.css|js by default, but future version of Rails do not.
+      config.assets.precompile += %w( application.css application.js )
+    end
     config.to_prepare do
       if ENV['VERBOSE']
         STDERR.puts "Loaded Rails #{Rails::VERSION::STRING}, Sprockets #{Sprockets::VERSION}",

data/test/gemfiles/rails_head.gemfile

@@ -9,7 +9,8 @@ gem 'sprockets', github: 'rails/sprockets'
 gem 'sprockets-rails', github: 'rails/sprockets-rails'
 gem 'sass-rails', github: 'rails/sass-rails', branch: 'master'
 
-gem 'autoprefixer-rails', github: 'ai/autoprefixer-rails'
+# Need https://github.com/ai/autoprefixer-rails/pull/73 fixed to unlock
+gem 'autoprefixer-rails', '= 6.1.0'
 
 source 'https://rails-assets.org' do
   gem 'rails-assets-tether', '>= 1.1.0'

data/test/rails_test.rb

@@ -16,4 +16,9 @@ class RailsTest < ActionDispatch::IntegrationTest
     get ActionController::Base.helpers.stylesheet_path('application.css')
     assert_match /-webkit-(?:transition|transform)/, response.body
   end
+
+  def test_precompile
+    Dummy::Application.load_tasks
+    Rake::Task['assets:precompile'].invoke
+  end
 end

data/test/support/dummy_rails_integration.rb

@@ -5,11 +5,12 @@ module DummyRailsIntegration
 
   def setup
     super
-    FileUtils.rm_rf('test/dummy_rails/tmp/cache', secure: true)
+    cleanup_dummy_rails_files
   end
 
   def teardown
     super
+    cleanup_dummy_rails_files
     Capybara.reset_sessions!
     Capybara.use_default_driver
   end
@@ -19,4 +20,10 @@ module DummyRailsIntegration
     page.driver.render(File.join(GEM_PATH, path), full: true)
     STDERR.puts "Screenshot saved to #{path}"
   end
+
+  private
+  def cleanup_dummy_rails_files
+    FileUtils.rm_rf('test/dummy_rails/tmp/cache', secure: true)
+    FileUtils.rm Dir.glob('test/dummy_rails/public/assets/*')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha1
+  version: 4.0.0.alpha2
 platform: ruby
 authors:
 - Twitter, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -286,6 +286,7 @@ files:
 - assets/stylesheets/bootstrap/_tables.scss
 - assets/stylesheets/bootstrap/_tooltip.scss
 - assets/stylesheets/bootstrap/_type.scss
+- assets/stylesheets/bootstrap/_utilities-background.scss
 - assets/stylesheets/bootstrap/_utilities-responsive.scss
 - assets/stylesheets/bootstrap/_utilities-spacing.scss
 - assets/stylesheets/bootstrap/_utilities.scss