bootstrap 4.0.0.beta → 4.0.0.beta2

data/assets/stylesheets/bootstrap/mixins/_navbar-align.scss

@@ -1,7 +1,8 @@
 // Navbar vertical align
 //
 // Vertically center elements in the navbar.
-// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin.
+// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);`
+// to calculate the appropriate top margin.
 
 // @mixin navbar-vertical-align($element-height) {
 //   margin-top: (($navbar-height - $element-height) / 2);

data/assets/stylesheets/bootstrap/mixins/_reset-text.scss

@@ -1,4 +1,3 @@
-// scss-lint:disable DuplicateProperty
 @mixin reset-text {
   font-family: $font-family-base;
   // We deliberately do NOT reset font-size or word-wrap.
@@ -6,7 +5,7 @@
   font-weight: $font-weight-normal;
   line-height: $line-height-base;
   text-align: left; // Fallback for where `start` is not supported
-  text-align: start;
+  text-align: start; // stylelint-disable-line declaration-block-no-duplicate-properties
   text-decoration: none;
   text-shadow: none;
   text-transform: none;

data/assets/stylesheets/bootstrap/mixins/_screen-reader.scss

@@ -1,7 +1,7 @@
 // Only display content to screen readers
 //
-// See: http://a11yproject.com/posts/how-to-hide-content
-// See: http://hugogiraudel.com/2016/10/13/css-hide-and-seek/
+// See: http://a11yproject.com/posts/how-to-hide-content/
+// See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/
 
 @mixin sr-only {
   position: absolute;

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

@@ -1,3 +1,5 @@
+// stylelint-disable declaration-no-important
+
 // Typography
 
 @mixin text-emphasis-variant($parent, $color) {

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

@@ -1,3 +1,5 @@
+// stylelint-disable declaration-no-important
+
 // Visibility
 
 @mixin invisible($visibility) {

data/assets/stylesheets/bootstrap/utilities/_align.scss

@@ -1,3 +1,5 @@
+// stylelint-disable declaration-no-important
+
 .align-baseline    { vertical-align: baseline !important; } // Browser default
 .align-top         { vertical-align: top !important; }
 .align-middle      { vertical-align: middle !important; }

data/assets/stylesheets/bootstrap/utilities/_background.scss

@@ -1,6 +1,19 @@
+// stylelint-disable declaration-no-important
+
 @each $color, $value in $theme-colors {
-  @include bg-variant('.bg-#{$color}', $value);
+  @include bg-variant(".bg-#{$color}", $value);
+}
+
+@if $enable-gradients {
+  @each $color, $value in $theme-colors {
+    @include bg-gradient-variant(".bg-gradient-#{$color}", $value);
+  }
 }
 
-.bg-white { background-color: $white !important; }
-.bg-transparent { background-color: transparent !important; }
+.bg-white {
+  background-color: $white !important;
+}
+
+.bg-transparent {
+  background-color: transparent !important;
+}

data/assets/stylesheets/bootstrap/utilities/_borders.scss

@@ -1,8 +1,10 @@
+// stylelint-disable declaration-no-important
+
 //
 // Border
 //
 
-.border          { border: 1px solid $gray-200 !important; }
+.border          { border: $border-width solid $border-color !important; }
 .border-0        { border: 0 !important; }
 .border-top-0    { border-top: 0 !important; }
 .border-right-0  { border-right: 0 !important; }
@@ -44,9 +46,9 @@
 }
 
 .rounded-circle {
-  border-radius: 50%;
+  border-radius: 50% !important;
 }
 
 .rounded-0 {
-  border-radius: 0;
+  border-radius: 0 !important;
 }

data/assets/stylesheets/bootstrap/utilities/_display.scss

@@ -1,3 +1,5 @@
+// stylelint-disable declaration-no-important
+
 //
 // Utilities for common `display` values
 //
@@ -11,6 +13,7 @@
     .d#{$infix}-inline-block { display: inline-block !important; }
     .d#{$infix}-block        { display: block !important; }
     .d#{$infix}-table        { display: table !important; }
+    .d#{$infix}-table-row    { display: table-row !important; }
     .d#{$infix}-table-cell   { display: table-cell !important; }
     .d#{$infix}-flex         { display: flex !important; }
     .d#{$infix}-inline-flex  { display: inline-flex !important; }

data/assets/stylesheets/bootstrap/utilities/_flex.scss

@@ -1,3 +1,5 @@
+// stylelint-disable declaration-no-important
+
 // Flex variation
 //
 // Custom styles for additional flex alignment options.

data/assets/stylesheets/bootstrap/utilities/_position.scss

@@ -1,4 +1,15 @@
-// Positioning
+// stylelint-disable declaration-no-important
+
+// Common values
+
+// Sass list not in variables since it's not intended for customization.
+$positions: static, relative, absolute, fixed, sticky;
+
+@each $position in $positions {
+  .position-#{$position} { position: $position !important; }
+}
+
+// Shorthand
 
 .fixed-top {
   position: fixed;

data/assets/stylesheets/bootstrap/utilities/_sizing.scss

@@ -1,3 +1,5 @@
+// stylelint-disable declaration-no-important
+
 // Width and height
 
 @each $prop, $abbrev in (width: w, height: h) {

data/assets/stylesheets/bootstrap/utilities/_spacing.scss

@@ -1,3 +1,5 @@
+// stylelint-disable declaration-no-important
+
 // Margin and Padding
 
 @each $breakpoint in map-keys($grid-breakpoints) {
@@ -7,35 +9,43 @@
     @each $prop, $abbrev in (margin: m, padding: p) {
       @each $size, $length in $spacers {
 
-        .#{$abbrev}#{$infix}-#{$size}  { #{$prop}:        $length !important; }
-        .#{$abbrev}t#{$infix}-#{$size} { #{$prop}-top:    $length !important; }
-        .#{$abbrev}r#{$infix}-#{$size} { #{$prop}-right:  $length !important; }
-        .#{$abbrev}b#{$infix}-#{$size} { #{$prop}-bottom: $length !important; }
-        .#{$abbrev}l#{$infix}-#{$size} { #{$prop}-left:   $length !important; }
+        .#{$abbrev}#{$infix}-#{$size} { #{$prop}: $length !important; }
+        .#{$abbrev}t#{$infix}-#{$size},
+        .#{$abbrev}y#{$infix}-#{$size} {
+          #{$prop}-top: $length !important;
+        }
+        .#{$abbrev}r#{$infix}-#{$size},
         .#{$abbrev}x#{$infix}-#{$size} {
           #{$prop}-right: $length !important;
-          #{$prop}-left:  $length !important;
         }
+        .#{$abbrev}b#{$infix}-#{$size},
         .#{$abbrev}y#{$infix}-#{$size} {
-          #{$prop}-top:    $length !important;
           #{$prop}-bottom: $length !important;
         }
+        .#{$abbrev}l#{$infix}-#{$size},
+        .#{$abbrev}x#{$infix}-#{$size} {
+          #{$prop}-left: $length !important;
+        }
       }
     }
 
     // Some special margin utils
-    .m#{$infix}-auto  { margin:        auto !important; }
-    .mt#{$infix}-auto { margin-top:    auto !important; }
-    .mr#{$infix}-auto { margin-right:  auto !important; }
-    .mb#{$infix}-auto { margin-bottom: auto !important; }
-    .ml#{$infix}-auto { margin-left:   auto !important; }
+    .m#{$infix}-auto { margin: auto !important; }
+    .mt#{$infix}-auto,
+    .my#{$infix}-auto {
+      margin-top: auto !important;
+    }
+    .mr#{$infix}-auto,
     .mx#{$infix}-auto {
       margin-right: auto !important;
-      margin-left:  auto !important;
     }
+    .mb#{$infix}-auto,
     .my#{$infix}-auto {
-      margin-top:    auto !important;
       margin-bottom: auto !important;
     }
+    .ml#{$infix}-auto,
+    .mx#{$infix}-auto {
+      margin-left: auto !important;
+    }
   }
 }

data/assets/stylesheets/bootstrap/utilities/_text.scss

@@ -1,3 +1,5 @@
+// stylelint-disable declaration-no-important
+
 //
 // Text
 //
@@ -28,16 +30,17 @@
 
 // Weight and italics
 
-.font-weight-normal { font-weight: $font-weight-normal; }
-.font-weight-bold   { font-weight: $font-weight-bold; }
-.font-italic        { font-style: italic; }
+.font-weight-light  { font-weight: $font-weight-light !important; }
+.font-weight-normal { font-weight: $font-weight-normal !important; }
+.font-weight-bold   { font-weight: $font-weight-bold !important; }
+.font-italic        { font-style: italic !important; }
 
 // Contextual colors
 
 .text-white { color: #fff !important; }
 
 @each $color, $value in $theme-colors {
-  @include text-emphasis-variant('.text-#{$color}', $value);
+  @include text-emphasis-variant(".text-#{$color}", $value);
 }
 
 .text-muted { color: $text-muted !important; }

data/bootstrap.gemspec

@@ -11,15 +11,14 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/twbs/bootstrap-rubygem'
   s.license  = 'MIT'
 
-  s.add_runtime_dependency 'popper_js', '~> 1.11.1'
+  s.add_runtime_dependency 'popper_js', '>= 1.12.3', '< 2'
 
-  s.add_runtime_dependency 'sass', '>= 3.4.19'
+  s.add_runtime_dependency 'sass', '>= 3.5.2'
   s.add_runtime_dependency 'autoprefixer-rails', '>= 6.0.3'
 
   # Testing dependencies
   s.add_development_dependency 'minitest', '~> 5.8.0'
   s.add_development_dependency 'minitest-reporters', '~> 1.0.5'
-  s.add_development_dependency 'compass', '~> 1.0.3'
   s.add_development_dependency 'term-ansicolor'
   # Integration testing
   s.add_development_dependency 'capybara', '>= 2.6.0'

data/lib/bootstrap.rb

@@ -5,8 +5,6 @@ module Bootstrap
   class << self
     # Inspired by Kaminari
     def load!
-      register_compass_extension if compass?
-
       if rails?
         register_rails_engine
       elsif hanami?
@@ -40,10 +38,6 @@ module Bootstrap
       defined?(::Sprockets)
     end
 
-    def compass?
-      defined?(::Compass::Frameworks)
-    end
-
     def rails?
       defined?(::Rails)
     end
@@ -60,16 +54,6 @@ module Bootstrap
       ::Sass.load_paths << stylesheets_path
     end
 
-    def register_compass_extension
-      ::Compass::Frameworks.register(
-          'bootstrap',
-          :version               => Bootstrap::VERSION,
-          :path                  => gem_path,
-          :stylesheets_directory => stylesheets_path,
-          :templates_directory   => File.join(gem_path, 'templates')
-      )
-    end
-
     def register_rails_engine
       require 'bootstrap/engine'
     end

data/lib/bootstrap/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '4.0.0.beta'
-  BOOTSTRAP_SHA = '35f80bb12e4e71fd777ee60ffa43711d8f84b1a6'
+  VERSION       = '4.0.0.beta2'
+  BOOTSTRAP_SHA = 'fc94de5b8b5b329a298eeeb76174b146ff17af2d'
 end

data/tasks/updater/js.rb

@@ -1,3 +1,5 @@
+require 'tsort'
+
 class Updater
   module Js
     def update_javascript_assets
@@ -28,10 +30,35 @@ class Updater
 
     def bootstrap_js_files
       @bootstrap_js_files ||= begin
-        package_json = get_file(file_url 'package.json')
-        JSON.parse(package_json)['scripts']['js-compile-bundle']
-            .match(/shx cat (.*?) \|/)[1].split(/\s+/)
-            .map { |p| p.sub %r(\Ajs/src/), '' }
+        src_files = get_paths_by_type('js/src', /\.js$/) - %w[index.js]
+        imports = Deps.new
+        # Get the imports from the ES6 files to order requires correctly.
+        read_files('js/src', src_files).each do |name, content|
+          imports.add name,
+                      *content.scan(%r{import [a-zA-Z]* from '\./(\w+)})
+                           .flatten(1).map { |f| "#{f}.js" }
+        end
+        imports.tsort
+      end
+    end
+
+    class Deps
+      include TSort
+
+      def initialize
+        @imports = {}
+      end
+
+      def add(from, *tos)
+        (@imports[from] ||= []).push(*tos)
+      end
+
+      def tsort_each_child(node, &block)
+        @imports[node].each(&block)
+      end
+
+      def tsort_each_node(&block)
+        @imports.each_key(&block)
       end
     end
   end

data/tasks/updater/scss.rb

@@ -21,18 +21,6 @@ class Updater
         # As we moved the files, adjust imports accordingly.
         File.write to, File.read(to).gsub(/ "/, ' "bootstrap/')
       end
-
-      log_status 'Generating variable template file'
-      save_file 'templates/project/_bootstrap-variables.scss',
-                "// Override Bootstrap variables here (defaults from bootstrap v#{upstream_version}):\n" +
-                    File.read("#{save_to}/_variables.scss").
-                        # The instructions in the file header are replaced with the line above
-                        lines[4..-1].
-                        join.
-                        # Comment out the assignments
-                        gsub(/^(?=[$@)}]|[ ]{2})/, '// ').
-                        # Remove the !default modifier
-                        gsub(/ !default/, '')
     end
   end
 end

data/test/dummy_rails/config/application.rb

@@ -11,7 +11,6 @@ require 'rails'
 end
 
 require 'autoprefixer-rails'
-require 'compass'
 require 'slim-rails'
 require 'uglifier'
 

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Twitter, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: popper_js
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.12.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.12.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.19
+        version: 3.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.19
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +285,7 @@ files:
 - assets/stylesheets/bootstrap/_print.scss
 - assets/stylesheets/bootstrap/_progress.scss
 - assets/stylesheets/bootstrap/_reboot.scss
+- assets/stylesheets/bootstrap/_root.scss
 - assets/stylesheets/bootstrap/_tables.scss
 - assets/stylesheets/bootstrap/_tooltip.scss
 - assets/stylesheets/bootstrap/_transitions.scss
@@ -306,6 +299,7 @@ files:
 - assets/stylesheets/bootstrap/mixins/_box-shadow.scss
 - assets/stylesheets/bootstrap/mixins/_breakpoints.scss
 - assets/stylesheets/bootstrap/mixins/_buttons.scss
+- assets/stylesheets/bootstrap/mixins/_caret.scss
 - assets/stylesheets/bootstrap/mixins/_clearfix.scss
 - assets/stylesheets/bootstrap/mixins/_float.scss
 - assets/stylesheets/bootstrap/mixins/_forms.scss
@@ -352,10 +346,6 @@ files:
 - tasks/updater/logger.rb
 - tasks/updater/network.rb
 - tasks/updater/scss.rb
-- templates/project/_bootstrap-variables.scss
-- templates/project/manifest.rb
-- templates/project/styles.scss
-- test/compass_test.rb
 - test/dummy_rails/README.rdoc
 - test/dummy_rails/Rakefile
 - test/dummy_rails/app/assets/images/.keep
@@ -418,7 +408,6 @@ specification_version: 4
 summary: The most popular HTML, CSS, and JavaScript framework for developing responsive,
   mobile first projects on the web. http://getbootstrap.com
 test_files:
-- test/compass_test.rb
 - test/dummy_rails/README.rdoc
 - test/dummy_rails/Rakefile
 - test/dummy_rails/app/assets/images/.keep