bootstrap-sass 3.3.6 → 3.4.1

data/assets/stylesheets/bootstrap/_variables.scss

@@ -51,14 +51,14 @@ $font-family-base:        $font-family-sans-serif !default;
 
 $font-size-base:          14px !default;
 $font-size-large:         ceil(($font-size-base * 1.25)) !default; // ~18px
-$font-size-small:         ceil(($font-size-base * 0.85)) !default; // ~12px
+$font-size-small:         ceil(($font-size-base * .85)) !default; // ~12px
 
 $font-size-h1:            floor(($font-size-base * 2.6)) !default; // ~36px
 $font-size-h2:            floor(($font-size-base * 2.15)) !default; // ~30px
 $font-size-h3:            ceil(($font-size-base * 1.7)) !default; // ~24px
 $font-size-h4:            ceil(($font-size-base * 1.25)) !default; // ~18px
 $font-size-h5:            $font-size-base !default;
-$font-size-h6:            ceil(($font-size-base * 0.85)) !default; // ~12px
+$font-size-h6:            ceil(($font-size-base * .85)) !default; // ~12px
 
 //** Unit-less `line-height` for use in components like buttons.
 $line-height-base:        1.428571429 !default; // 20/14
@@ -116,7 +116,7 @@ $component-active-color:    #fff !default;
 //** Global background color for active items (e.g., navs or dropdowns).
 $component-active-bg:       $brand-primary !default;
 
-//** Width of the `border` for generating carets that indicator dropdowns.
+//** Width of the `border` for generating carets that indicate dropdowns.
 $caret-width-base:          4px !default;
 //** Carets increase slightly in size for larger components.
 $caret-width-large:         5px !default;
@@ -239,7 +239,7 @@ $cursor-disabled:                not-allowed !default;
 //** Background for the dropdown menu.
 $dropdown-bg:                    #fff !default;
 //** Dropdown menu `border-color`.
-$dropdown-border:                rgba(0,0,0,.15) !default;
+$dropdown-border:                rgba(0, 0, 0, .15) !default;
 //** Dropdown menu `border-color` **for IE8**.
 $dropdown-fallback-border:       #ccc !default;
 //** Divider color for between dropdown items.
@@ -545,7 +545,7 @@ $popover-bg:                          #fff !default;
 //** Popover maximum width
 $popover-max-width:                   276px !default;
 //** Popover border color
-$popover-border-color:                rgba(0,0,0,.2) !default;
+$popover-border-color:                rgba(0, 0, 0, .2) !default;
 //** Popover fallback border color
 $popover-fallback-border-color:       #ccc !default;
 
@@ -603,7 +603,7 @@ $modal-title-line-height:     $line-height-base !default;
 //** Background color of modal content area
 $modal-content-bg:                             #fff !default;
 //** Modal content border color
-$modal-content-border-color:                   rgba(0,0,0,.2) !default;
+$modal-content-border-color:                   rgba(0, 0, 0, .2) !default;
 //** Modal content border color **for IE8**
 $modal-content-fallback-border-color:          #999 !default;
 
@@ -808,7 +808,7 @@ $breadcrumb-separator:          "/" !default;
 //
 //##
 
-$carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6) !default;
+$carousel-text-shadow:                        0 1px 2px rgba(0, 0, 0, .6) !default;
 
 $carousel-control-color:                      #fff !default;
 $carousel-control-width:                      15% !default;

data/assets/stylesheets/bootstrap/_wells.scss

@@ -11,10 +11,10 @@
   background-color: $well-bg;
   border: 1px solid $well-border;
   border-radius: $border-radius-base;
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .05));
   blockquote {
     border-color: #ddd;
-    border-color: rgba(0,0,0,.15);
+    border-color: rgba(0, 0, 0, .15);
   }
 }
 

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

@@ -1,13 +1,14 @@
 // Alerts
 
 @mixin alert-variant($background, $border, $text-color) {
+  color: $text-color;
   background-color: $background;
   border-color: $border;
-  color: $text-color;
 
   hr {
     border-top-color: darken($border, 5%);
   }
+
   .alert-link {
     color: darken($text-color, 10%);
   }

data/assets/stylesheets/bootstrap/mixins/_border-radius.scss

@@ -1,18 +1,18 @@
 // Single side border-radius
 
 @mixin border-top-radius($radius) {
+  border-top-left-radius: $radius;
   border-top-right-radius: $radius;
-   border-top-left-radius: $radius;
 }
 @mixin border-right-radius($radius) {
+  border-top-right-radius: $radius;
   border-bottom-right-radius: $radius;
-     border-top-right-radius: $radius;
 }
 @mixin border-bottom-radius($radius) {
   border-bottom-right-radius: $radius;
-   border-bottom-left-radius: $radius;
+  border-bottom-left-radius: $radius;
 }
 @mixin border-left-radius($radius) {
+  border-top-left-radius: $radius;
   border-bottom-left-radius: $radius;
-     border-top-left-radius: $radius;
 }

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

@@ -12,33 +12,29 @@
   &.focus {
     color: $color;
     background-color: darken($background, 10%);
-        border-color: darken($border, 25%);
+    border-color: darken($border, 25%);
   }
   &:hover {
     color: $color;
     background-color: darken($background, 10%);
-        border-color: darken($border, 12%);
+    border-color: darken($border, 12%);
   }
   &:active,
   &.active,
   .open > &.dropdown-toggle {
     color: $color;
     background-color: darken($background, 10%);
-        border-color: darken($border, 12%);
+    background-image: none;
+    border-color: darken($border, 12%);
 
     &:hover,
     &:focus,
     &.focus {
       color: $color;
       background-color: darken($background, 17%);
-          border-color: darken($border, 25%);
+      border-color: darken($border, 25%);
     }
   }
-  &:active,
-  &.active,
-  .open > &.dropdown-toggle {
-    background-image: none;
-  }
   &.disabled,
   &[disabled],
   fieldset[disabled] & {
@@ -46,7 +42,7 @@
     &:focus,
     &.focus {
       background-color: $background;
-          border-color: $border;
+      border-color: $border;
     }
   }
 

data/assets/stylesheets/bootstrap/mixins/_center-block.scss

@@ -2,6 +2,6 @@
 
 @mixin center-block() {
   display: block;
-  margin-left: auto;
   margin-right: auto;
+  margin-left: auto;
 }

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

@@ -13,8 +13,8 @@
 @mixin clearfix() {
   &:before,
   &:after {
-    content: " "; // 1
     display: table; // 2
+    content: " "; // 1
   }
   &:after {
     clear: both;

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

@@ -20,18 +20,18 @@
   // Set the border and box shadow on specific inputs to match
   .form-control {
     border-color: $border-color;
-    @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
+    @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075)); // Redeclare so transitions work
     &:focus {
       border-color: darken($border-color, 10%);
-      $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($border-color, 20%);
+      $shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px lighten($border-color, 20%);
       @include box-shadow($shadow);
     }
   }
   // Set validation states also for addons
   .input-group-addon {
     color: $text-color;
-    border-color: $border-color;
     background-color: $background-color;
+    border-color: $border-color;
   }
   // Optional feedback icon
   .form-control-feedback {
@@ -57,7 +57,7 @@
   &:focus {
     border-color: $color;
     outline: 0;
-    @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $color-rgba);
+    @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px $color-rgba);
   }
 }
 

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

@@ -1,5 +1,3 @@
-// Gradients
-
 
 
 // Horizontal gradient, from left to right
@@ -10,8 +8,8 @@
   background-image: -webkit-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+
   background-image: -o-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Opera 12
   background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down
+  background-repeat: repeat-x;
 }
 
 // Vertical gradient, from top to bottom
@@ -22,36 +20,36 @@
   background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent);  // Safari 5.1-6, Chrome 10+
   background-image: -o-linear-gradient(top, $start-color $start-percent, $end-color $end-percent);  // Opera 12
   background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down
+  background-repeat: repeat-x;
 }
 
 @mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
-  background-repeat: repeat-x;
   background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+
   background-image: -o-linear-gradient($deg, $start-color, $end-color); // Opera 12
   background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+  background-repeat: repeat-x;
 }
 @mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
   background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
   background-image: -o-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
   background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
-  background-repeat: no-repeat;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
+  background-repeat: no-repeat;
 }
 @mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
   background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
   background-image: -o-linear-gradient($start-color, $mid-color $color-stop, $end-color);
   background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
-  background-repeat: no-repeat;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
+  background-repeat: no-repeat;
 }
 @mixin gradient-radial($inner-color: #555, $outer-color: #333) {
   background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color);
   background-image: radial-gradient(circle, $inner-color, $outer-color);
   background-repeat: no-repeat;
 }
-@mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) {
+@mixin gradient-striped($color: rgba(255, 255, 255, .15), $angle: 45deg) {
   background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
   background-image: -o-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
   background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);

data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss

@@ -13,8 +13,8 @@
     // Prevent columns from collapsing when empty
     min-height: 1px;
     // Inner gutter via padding
-    padding-left:  ceil(($grid-gutter-width / 2));
     padding-right: floor(($grid-gutter-width / 2));
+    padding-left: ceil(($grid-gutter-width / 2));
   }
 }
 

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

@@ -4,17 +4,17 @@
 
 // Centered container element
 @mixin container-fixed($gutter: $grid-gutter-width) {
+  padding-right: ceil(($gutter / 2));
+  padding-left: floor(($gutter / 2));
   margin-right: auto;
   margin-left: auto;
-  padding-left:  floor(($gutter / 2));
-  padding-right: ceil(($gutter / 2));
   @include clearfix;
 }
 
 // Creates a wrapper for a series of columns
 @mixin make-row($gutter: $grid-gutter-width) {
-  margin-left:  ceil(($gutter / -2));
   margin-right: floor(($gutter / -2));
+  margin-left: ceil(($gutter / -2));
   @include clearfix;
 }
 
@@ -24,8 +24,8 @@
   float: left;
   width: percentage(($columns / $grid-columns));
   min-height: 1px;
-  padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
+  padding-left: ($gutter / 2);
 }
 @mixin make-xs-column-offset($columns) {
   margin-left: percentage(($columns / $grid-columns));
@@ -41,8 +41,8 @@
 @mixin make-sm-column($columns, $gutter: $grid-gutter-width) {
   position: relative;
   min-height: 1px;
-  padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
+  padding-left: ($gutter / 2);
 
   @media (min-width: $screen-sm-min) {
     float: left;
@@ -69,8 +69,8 @@
 @mixin make-md-column($columns, $gutter: $grid-gutter-width) {
   position: relative;
   min-height: 1px;
-  padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
+  padding-left: ($gutter / 2);
 
   @media (min-width: $screen-md-min) {
     float: left;
@@ -97,8 +97,8 @@
 @mixin make-lg-column($columns, $gutter: $grid-gutter-width) {
   position: relative;
   min-height: 1px;
-  padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
+  padding-left: ($gutter / 2);
 
   @media (min-width: $screen-lg-min) {
     float: left;

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

@@ -1,8 +1,3 @@
-// Image Mixins
-// - Responsive image
-// - Retina image
-
-
 // Responsive image
 //
 // Keep images from scaling beyond the width of their parents.
@@ -22,11 +17,11 @@
 
   @media
   only screen and (-webkit-min-device-pixel-ratio: 2),
-  only screen and (   min--moz-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--moz-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) {
     background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("#{$file-2x}"), "#{$file-2x}"));
     background-size: $width-1x $height-1x;
   }

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

@@ -1,8 +1,7 @@
 // Opacity
 
 @mixin opacity($opacity) {
-  opacity: $opacity;
-  // IE8 filter
-  $opacity-ie: ($opacity * 100);
+  $opacity-ie: ($opacity * 100);  // IE8 filter
   filter: alpha(opacity=$opacity-ie);
+  opacity: $opacity;
 }

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

@@ -2,17 +2,17 @@
   font-family: $font-family-base;
   // We deliberately do NOT reset font-size.
   font-style: normal;
-  font-weight: normal;
-  letter-spacing: normal;
-  line-break: auto;
+  font-weight: 400;
   line-height: $line-height-base;
+  line-break: auto;
   text-align: left; // Fallback for where `start` is not supported
   text-align: start;
   text-decoration: none;
   text-shadow: none;
   text-transform: none;
-  white-space: normal;
+  letter-spacing: normal;
   word-break: normal;
   word-spacing: normal;
   word-wrap: normal;
+  white-space: normal;
 }

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

@@ -1,6 +1,6 @@
 // Resize anything
 
 @mixin resizable($direction) {
-  resize: $direction; // Options: horizontal, vertical, both
   overflow: auto; // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible`
+  resize: $direction; // Options: horizontal, vertical, both
 }

data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss

@@ -1,7 +1,3 @@
-// Responsive utilities
-
-//
-// More easily include all the states for responsive-utilities.less.
 // [converter] $parent hack
 @mixin responsive-visibility($parent) {
   #{$parent} {

data/assets/stylesheets/bootstrap/mixins/_tab-focus.scss

@@ -1,9 +1,9 @@
 // WebKit-style focus
 
 @mixin tab-focus() {
-  // Default
-  outline: thin dotted;
-  // WebKit
+  // WebKit-specific. Other browsers will keep their default outline style.
+  // (Initially tried to also force default via `outline: initial`,
+  // but that seems to erroneously remove the outline in Firefox altogether.)
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }

data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss

@@ -89,12 +89,12 @@
 
 // Optional hyphenation
 @mixin hyphens($mode: auto) {
-  word-wrap: break-word;
   -webkit-hyphens: $mode;
      -moz-hyphens: $mode;
       -ms-hyphens: $mode; // IE10+
        -o-hyphens: $mode;
           hyphens: $mode;
+  word-wrap: break-word;
 }
 
 // Placeholder text

data/bootstrap-sass.gemspec

@@ -11,16 +11,17 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/twbs/bootstrap-sass'
   s.license  = 'MIT'
 
-  s.add_runtime_dependency 'sass', '>= 3.3.4'
+  s.add_runtime_dependency 'sassc', '>= 2.0.0'
   s.add_runtime_dependency 'autoprefixer-rails', '>= 5.2.1'
 
   # Testing dependencies
-  s.add_development_dependency 'minitest', '~> 5.8'
-  s.add_development_dependency 'minitest-reporters', '~> 1.1'
+  s.add_development_dependency 'minitest', '~> 5.11'
+  s.add_development_dependency 'minitest-reporters', '~> 1.3'
   # Integration testing
-  s.add_development_dependency 'capybara', '>= 2.5.0'
+  s.add_development_dependency 'capybara', '~> 3.6'
   s.add_development_dependency 'poltergeist'
   # Dummy Rails app dependencies
+  s.add_development_dependency 'sassc-rails', '>= 2.0.0'
   s.add_development_dependency 'actionpack', '>= 4.1.5'
   s.add_development_dependency 'activesupport', '>= 4.1.5'
   s.add_development_dependency 'json', '>= 1.8.1'

data/bower.json

@@ -30,7 +30,7 @@
     "Gemfile"
   ],
   "dependencies": {
-    "jquery": ">= 1.9.0"
+    "jquery": "1.9.1 - 3"
   },
-  "version": "3.3.6"
+  "version": "3.4.1"
 }

data/composer.json

@@ -29,7 +29,7 @@
     "license": "MIT",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.3.x-dev"
+            "dev-master": "3.4.x-dev"
         }
     }
 }

data/eyeglass-exports.js

@@ -0,0 +1,7 @@
+var path = require('path');
+
+module.exports = function(eyeglass, sass) {
+  return {
+    sassDir: path.join(__dirname, 'assets/stylesheets')
+  }
+};

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '3.3.6'
-  BOOTSTRAP_SHA = '81df608a40bf0629a1dc08e584849bb1e43e0b7a'
+  VERSION       = '3.4.1'
+  BOOTSTRAP_SHA = '68b0d231a13201eb14acd3dc84e51543d16e5f7e'
 end

data/lib/bootstrap-sass.rb

@@ -7,13 +7,19 @@ module Bootstrap
 
       if rails?
         register_rails_engine
-      elsif lotus?
-        register_lotus
+      elsif hanami?
+        register_hanami
       elsif sprockets?
         register_sprockets
+      elsif defined?(::Sass) && ::Sass.respond_to?(:load_paths)
+        # The deprecated `sass` gem:
+        ::Sass.load_paths << stylesheets_path
       end
 
-      configure_sass
+      if defined?(::Sass::Script::Value::Number)
+        # bootstrap requires minimum precision of 8, see https://github.com/twbs/bootstrap-sass/issues/409
+        ::Sass::Script::Value::Number.precision = [8, ::Sass::Script::Value::Number.precision].max
+      end
     end
 
     # Paths
@@ -50,21 +56,12 @@ module Bootstrap
       defined?(::Rails)
     end
 
-    def lotus?
-      defined?(::Lotus)
+    def hanami?
+      defined?(::Hanami)
     end
 
     private
 
-    def configure_sass
-      require 'sass'
-
-      ::Sass.load_paths << stylesheets_path
-
-      # bootstrap requires minimum precision of 8, see https://github.com/twbs/bootstrap-sass/issues/409
-      ::Sass::Script::Number.precision = [8, ::Sass::Script::Number.precision].max
-    end
-
     def register_compass_extension
       ::Compass::Frameworks.register(
           'bootstrap',
@@ -79,8 +76,8 @@ module Bootstrap
       require 'bootstrap-sass/engine'
     end
 
-    def register_lotus
-      Lotus::Assets.sources << assets_path
+    def register_hanami
+      Hanami::Assets.sources << assets_path
     end
 
     def register_sprockets