bootstrap-sass 3.3.4.1 → 3.3.5

data/assets/stylesheets/bootstrap/_panels.scss

@@ -76,6 +76,7 @@
         @include border-top-radius(($panel-border-radius - 1));
       }
     }
+
     // Add border bottom radius for last one
     &:last-child {
       .list-group-item:last-child {
@@ -84,6 +85,11 @@
       }
     }
   }
+  > .panel-heading + .panel-collapse > .list-group {
+    .list-group-item:first-child {
+      @include border-top-radius(0);
+    }
+  }
 }
 // Collapse space between when there's no additional content.
 .panel-heading + .list-group {

data/assets/stylesheets/bootstrap/_popovers.scss

@@ -11,12 +11,11 @@
   display: none;
   max-width: $popover-max-width;
   padding: 1px;
-  // Reset font and text properties given new insertion method
-  font-family: $font-family-base;
+  // Our parent element can be arbitrary since popovers are by default inserted as a sibling of their target element.
+  // So reset our font and text properties to avoid inheriting weird values.
+  @include reset-text;
   font-size: $font-size-base;
-  font-weight: normal;
-  line-height: $line-height-base;
-  text-align: left;
+
   background-color: $popover-bg;
   background-clip: padding-box;
   border: 1px solid $popover-fallback-border-color;
@@ -24,9 +23,6 @@
   border-radius: $border-radius-large;
   @include box-shadow(0 5px 10px rgba(0,0,0,.2));
 
-  // Overrides for proper insertion
-  white-space: normal;
-
   // Offset the popover to account for the popover arrow
   &.top     { margin-top: -$popover-arrow-width; }
   &.right   { margin-left: $popover-arrow-width; }

data/assets/stylesheets/bootstrap/_print.scss

@@ -67,12 +67,6 @@
     }
 
     // Bootstrap specific changes start
-    //
-    // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
-    // Once fixed, we can just straight up remove this.
-    select {
-        background: #fff !important;
-    }
 
     // Bootstrap components
     .navbar {

data/assets/stylesheets/bootstrap/_responsive-utilities.scss

@@ -18,8 +18,10 @@
 // Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
 // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
 
-@-ms-viewport {
-  width: device-width;
+@at-root {
+  @-ms-viewport {
+    width: device-width;
+  }
 }
 
 

data/assets/stylesheets/bootstrap/_scaffolding.scss

@@ -155,8 +155,7 @@ hr {
 // Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
 // for traditionally non-focusable elements with role="button"
 // see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
-// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged
 
 [role="button"] {
   cursor: pointer;
-}
+}

data/assets/stylesheets/bootstrap/_theme.scss

@@ -1,3 +1,8 @@
+/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
 
 //
 // Load core variables and mixins
@@ -28,6 +33,12 @@
     @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
   }
 
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    @include box-shadow(none);
+  }
+
   .badge {
     text-shadow: none;
   }
@@ -53,10 +64,17 @@
   }
 
   &.disabled,
-  &:disabled,
-  &[disabled] {
-    background-color: darken($btn-color, 12%);
-    background-image: none;
+  &[disabled],
+  fieldset[disabled] & {
+    &,
+    &:hover,
+    &:focus,
+    &.focus,
+    &:active,
+    &.active {
+      background-color: darken($btn-color, 12%);
+      background-image: none;
+    }
   }
 }
 
@@ -132,7 +150,7 @@
 .navbar-inverse {
   @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
   @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
-
+  border-radius: $navbar-border-radius;
   .navbar-nav > .open > a,
   .navbar-nav > .active > a {
     @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));

data/assets/stylesheets/bootstrap/_tooltip.scss

@@ -8,11 +8,11 @@
   position: absolute;
   z-index: $zindex-tooltip;
   display: block;
-  // Reset font and text properties given new insertion method
-  font-family: $font-family-base;
+  // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
+  // So reset our font and text properties to avoid inheriting weird values.
+  @include reset-text;
   font-size: $font-size-small;
-  font-weight: normal;
-  line-height: 1.4;
+
   @include opacity(0);
 
   &.in     { @include opacity($tooltip-opacity); }
@@ -28,7 +28,6 @@
   padding: 3px 8px;
   color: $tooltip-color;
   text-align: center;
-  text-decoration: none;
   background-color: $tooltip-bg;
   border-radius: $border-radius-base;
 }

data/assets/stylesheets/bootstrap/_variables.scss

@@ -175,6 +175,11 @@ $btn-danger-border:              darken($btn-danger-bg, 5%) !default;
 
 $btn-link-disabled-color:        $gray-light !default;
 
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius-base:         $border-radius-base !default;
+$btn-border-radius-large:        $border-radius-large !default;
+$btn-border-radius-small:        $border-radius-small !default;
+
 
 //== Forms
 //
@@ -388,7 +393,7 @@ $navbar-default-toggle-icon-bar-bg:        #888 !default;
 $navbar-default-toggle-border-color:       #ddd !default;
 
 
-// Inverted navbar
+//=== Inverted navbar
 // Reset inverted navbar basics
 $navbar-inverse-color:                      lighten($gray-light, 15%) !default;
 $navbar-inverse-bg:                         #222 !default;
@@ -489,6 +494,7 @@ $jumbotron-color:                inherit !default;
 $jumbotron-bg:                   $gray-lighter !default;
 $jumbotron-heading-color:        inherit !default;
 $jumbotron-font-size:            ceil(($font-size-base * 1.5)) !default;
+$jumbotron-heading-font-size:    ceil(($font-size-base * 4.5)) !default;
 
 
 //== Form states and alerts

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

@@ -5,7 +5,8 @@
   #{$parent} {
     background-color: $color;
   }
-  a#{$parent}:hover {
+  a#{$parent}:hover,
+  a#{$parent}:focus {
     background-color: darken($color, 10%);
   }
 }

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

@@ -8,15 +8,31 @@
   background-color: $background;
   border-color: $border;
 
-  &:hover,
   &:focus,
-  &.focus,
+  &.focus {
+    color: $color;
+    background-color: darken($background, 10%);
+        border-color: darken($border, 25%);
+  }
+  &:hover {
+    color: $color;
+    background-color: darken($background, 10%);
+        border-color: darken($border, 12%);
+  }
   &:active,
   &.active,
   .open > &.dropdown-toggle {
     color: $color;
     background-color: darken($background, 10%);
         border-color: darken($border, 12%);
+
+    &:hover,
+    &:focus,
+    &.focus {
+      color: $color;
+      background-color: darken($background, 17%);
+          border-color: darken($border, 25%);
+    }
   }
   &:active,
   &.active,

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:  ($grid-gutter-width / 2);
-    padding-right: ($grid-gutter-width / 2);
+    padding-left:  ceil(($grid-gutter-width / 2));
+    padding-right: floor(($grid-gutter-width / 2));
   }
 }
 

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

@@ -13,8 +13,8 @@
 
 // Creates a wrapper for a series of columns
 @mixin make-row($gutter: $grid-gutter-width) {
-  margin-left:  ($gutter / -2);
-  margin-right: ($gutter / -2);
+  margin-left:  ceil(($gutter / -2));
+  margin-right: floor(($gutter / -2));
   @include clearfix;
 }
 

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

@@ -1,6 +1,6 @@
 // CSS image replacement
 //
-// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
+// Heads up! v3 launched with only `.hide-text()`, but per our pattern for
 // mixins being reused as classes with the same name, this doesn't hold up. As
 // of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
 //

data/assets/stylesheets/bootstrap/mixins/_list-group.scss

@@ -5,10 +5,11 @@
     color: $color;
     background-color: $background;
 
-    // [converter] extracted a& to a.list-group-item-#{$state}
+    // [converter] extracted a&, button& to a.list-group-item-#{$state}, button.list-group-item-#{$state}
   }
 
-  a.list-group-item-#{$state} {
+  a.list-group-item-#{$state},
+  button.list-group-item-#{$state} {
     color: $color;
 
     .list-group-item-heading {

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

@@ -1,11 +1,12 @@
 // Pagination
 
-@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) {
+@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
   > li {
     > a,
     > span {
       padding: $padding-vertical $padding-horizontal;
       font-size: $font-size;
+      line-height: $line-height;
     }
     &:first-child {
       > a,

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

@@ -0,0 +1,18 @@
+@mixin reset-text() {
+  font-family: $font-family-base;
+  // We deliberately do NOT reset font-size.
+  font-style: normal;
+  font-weight: normal;
+  letter-spacing: normal;
+  line-break: auto;
+  line-height: $line-height-base;
+  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;
+  word-break: normal;
+  word-spacing: normal;
+  word-wrap: normal;
+}

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

@@ -7,7 +7,7 @@
   #{$parent} {
     display: block !important;
   }
-  table#{$parent}  { display: table; }
+  table#{$parent}  { display: table !important; }
   tr#{$parent}     { display: table-row !important; }
   th#{$parent},
   td#{$parent}     { display: table-cell !important; }

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

@@ -5,7 +5,8 @@
   #{$parent} {
     color: $color;
   }
-  a#{$parent}:hover {
+  a#{$parent}:hover,
+  a#{$parent}:focus {
     color: darken($color, 10%);
   }
 }

data/bower.json

@@ -1,6 +1,5 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.4",
   "homepage": "https://github.com/twbs/bootstrap-sass",
   "authors": [
     "Thomas McDonald",
@@ -9,13 +8,9 @@
     "Gleb Mazovetskiy"
   ],
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
+  "moduleType": "globals",
   "main": [
     "assets/stylesheets/_bootstrap.scss",
-    "assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
-    "assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
-    "assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
-    "assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
-    "assets/fonts/bootstrap/glyphicons-halflings-regular.woff2",
     "assets/javascripts/bootstrap.js"
   ],
   "keywords": [

data/lib/bootstrap-sass.rb

@@ -41,7 +41,7 @@ module Bootstrap
     end
 
     def compass?
-      defined?(::Compass)
+      defined?(::Compass::Frameworks)
     end
 
     def rails?

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '3.3.4.1'
-  BOOTSTRAP_SHA = 'f5250d0a0e2a7cfed77f55654027ff151ebe5aeb'
+  VERSION       = '3.3.5'
+  BOOTSTRAP_SHA = '16b48259a62f576e52c903c476bd42b90ab22482'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.4",
+  "version": "3.3.5",
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
   "main": "assets/javascripts/bootstrap.js",
   "repository": {

data/tasks/converter/less_conversion.rb

@@ -118,10 +118,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', 'labels.less', 'badges.less'
+          when 'thumbnails.less', 'labels.less', 'badges.less', 'buttons.less'
             file = extract_nested_rule file, 'a&'
           when 'glyphicons.less'
-            file = replace_rules(file, '@font-face') { |rule|
+            file = replace_rules(file, /\s*@font-face/) { |rule|
               rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
               replace_asset_url rule, :font
             }
@@ -169,9 +169,16 @@ class Converter
       file   = deinterpolate_vararg_mixins(file)
       file   = replace_calculation_semantics(file)
       file   = replace_file_imports(file)
+      file   = wrap_at_groups_with_at_root(file)
       file
     end
 
+    def wrap_at_groups_with_at_root(file)
+      replace_rules(file, /@(?:font-face|-ms-viewport)/) { |rule, _pos|
+        %Q(@at-root {\n#{indent rule, 2}\n})
+      }
+    end
+
     def sass_fn_exists(fn)
       %Q{(#{fn}("") != unquote('#{fn}("")'))}
     end

data/templates/project/_bootstrap-variables.sass

@@ -1,4 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.4):
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.5):
 
 //
 // Variables
@@ -176,6 +176,11 @@
 
 // $btn-link-disabled-color:        $gray-light
 
+// Allows for customizing button radius independently from global border radius
+// $btn-border-radius-base:         $border-radius-base
+// $btn-border-radius-large:        $border-radius-large
+// $btn-border-radius-small:        $border-radius-small
+
 
 //== Forms
 //
@@ -389,7 +394,7 @@
 // $navbar-default-toggle-border-color:       #ddd
 
 
-// Inverted navbar
+//=== Inverted navbar
 // Reset inverted navbar basics
 // $navbar-inverse-color:                      lighten($gray-light, 15%)
 // $navbar-inverse-bg:                         #222
@@ -490,6 +495,7 @@
 // $jumbotron-bg:                   $gray-lighter
 // $jumbotron-heading-color:        inherit
 // $jumbotron-font-size:            ceil(($font-size-base * 1.5))
+// $jumbotron-heading-font-size:    ceil(($font-size-base * 4.5))
 
 
 //== Form states and alerts