bootstrap-sass-backport 3.2.0.2 → 3.3.1.0

data/assets/stylesheets/bootstrap/_theme.scss

@@ -7,7 +7,6 @@
 @import "mixins";
 
 
-
 //
 // Buttons
 // --------------------------------------------------
@@ -28,12 +27,16 @@
   &.active {
     @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
   }
+
+  .badge {
+    text-shadow: none;
+  }
 }
 
 // Mixin for generating new styles
 @mixin btn-styles($btn-color: #555) {
   @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
-  @include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
+  @include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners
   background-repeat: repeat-x;
   border-color: darken($btn-color, 14%);
 
@@ -74,7 +77,6 @@
 .btn-danger  { @include btn-styles($btn-danger-bg); }
 
 
-
 //
 // Images
 // --------------------------------------------------
@@ -85,7 +87,6 @@
 }
 
 
-
 //
 // Dropdowns
 // --------------------------------------------------
@@ -103,7 +104,6 @@
 }
 
 
-
 //
 // Navbar
 // --------------------------------------------------
@@ -111,13 +111,14 @@
 // Default navbar
 .navbar-default {
   @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
-  @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
+  @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
   border-radius: $navbar-border-radius;
   $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
   @include box-shadow($shadow);
 
+  .navbar-nav > .open > a,
   .navbar-nav > .active > a {
-    @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
+    @include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%));
     @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
   }
 }
@@ -129,10 +130,11 @@
 // Inverted navbar
 .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
+  @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
 
+  .navbar-nav > .open > a,
   .navbar-nav > .active > a {
-    @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
+    @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
     @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
   }
 
@@ -149,6 +151,17 @@
   border-radius: 0;
 }
 
+// Fix active state of dropdown items in collapsed mode
+@media (max-width: $grid-float-breakpoint-max) {
+  .navbar .navbar-nav .open .dropdown-menu > .active > a {
+    &,
+    &:hover,
+    &:focus {
+      color: #fff;
+      @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
+    }
+  }
+}
 
 
 //
@@ -175,7 +188,6 @@
 .alert-danger     { @include alert-styles($alert-danger-bg); }
 
 
-
 //
 // Progress bars
 // --------------------------------------------------
@@ -200,7 +212,7 @@
 // Reset the striped class because our mixins don't do multiple gradients and
 // the above custom styles override the new `.progress-bar-striped` in v3.2.0.
 .progress-bar-striped {
-  @include gradient-striped();
+  @include gradient-striped;
 }
 
 
@@ -218,8 +230,11 @@
   text-shadow: 0 -1px 0 darken($list-group-active-bg, 10%);
   @include gradient-vertical($start-color: $list-group-active-bg, $end-color: darken($list-group-active-bg, 7.5%));
   border-color: darken($list-group-active-border, 7.5%);
-}
 
+  .badge {
+    text-shadow: none;
+  }
+}
 
 
 //
@@ -245,7 +260,6 @@
 .panel-danger > .panel-heading    { @include panel-heading-styles($panel-danger-heading-bg); }
 
 
-
 //
 // Wells
 // --------------------------------------------------

data/assets/stylesheets/bootstrap/_thumbnails.scss

@@ -12,11 +12,11 @@
   background-color: $thumbnail-bg;
   border: 1px solid $thumbnail-border;
   border-radius: $thumbnail-border-radius;
-  @include transition(all .2s ease-in-out);
+  @include transition(border .2s ease-in-out);
 
   > img,
   a > img {
-    @include img-responsive();
+    @include img-responsive;
     margin-left: auto;
     margin-right: auto;
   }

data/assets/stylesheets/bootstrap/_tooltip.scss

@@ -9,7 +9,10 @@
   z-index: $zindex-tooltip;
   display: block;
   visibility: visible;
+  // Reset font and text propertes given new insertion method
+  font-family: $font-family-base;
   font-size: $font-size-small;
+  font-weight: normal;
   line-height: 1.4;
   @include opacity(0);
 
@@ -39,6 +42,7 @@
   border-color: transparent;
   border-style: solid;
 }
+// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
 .tooltip {
   &.top .tooltip-arrow {
     bottom: 0;
@@ -49,13 +53,15 @@
   }
   &.top-left .tooltip-arrow {
     bottom: 0;
-    left: $tooltip-arrow-width;
+    right: $tooltip-arrow-width;
+    margin-bottom: -$tooltip-arrow-width;
     border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
     border-top-color: $tooltip-arrow-color;
   }
   &.top-right .tooltip-arrow {
     bottom: 0;
-    right: $tooltip-arrow-width;
+    left: $tooltip-arrow-width;
+    margin-bottom: -$tooltip-arrow-width;
     border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
     border-top-color: $tooltip-arrow-color;
   }
@@ -82,13 +88,15 @@
   }
   &.bottom-left .tooltip-arrow {
     top: 0;
-    left: $tooltip-arrow-width;
+    right: $tooltip-arrow-width;
+    margin-top: -$tooltip-arrow-width;
     border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
     border-bottom-color: $tooltip-arrow-color;
   }
   &.bottom-right .tooltip-arrow {
     top: 0;
-    right: $tooltip-arrow-width;
+    left: $tooltip-arrow-width;
+    margin-top: -$tooltip-arrow-width;
     border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
     border-bottom-color: $tooltip-arrow-color;
   }

data/assets/stylesheets/bootstrap/_type.scss

@@ -80,11 +80,6 @@ small,
   font-size: floor((100% * $font-size-small / $font-size-base));
 }
 
-// Undo browser default styling
-cite {
-  font-style: normal;
-}
-
 mark,
 .mark {
   background-color: $state-warning-bg;
@@ -163,15 +158,20 @@ ol {
 
 // List options
 
-// Unstyled keeps list items block level, just removes default browser padding and list-style
-.list-unstyled {
+// [converter] extracted from `.list-unstyled` for libsass compatibility
+@mixin list-unstyled {
   padding-left: 0;
   list-style: none;
 }
+// [converter] extracted as `@mixin list-unstyled` for libsass compatibility
+.list-unstyled {
+  @include list-unstyled;
+}
+
 
 // Inline turns list items into inline-block
 .list-inline {
-  @extend .list-unstyled;
+  @include list-unstyled;
   margin-left: -5px;
 
   > li {
@@ -204,7 +204,7 @@ dd {
 
 .dl-horizontal {
   dd {
-    @include clearfix(); // Clear the floated `dt` if an empty `dd` is present
+    @include clearfix; // Clear the floated `dt` if an empty `dd` is present
   }
 
   @media (min-width: $grid-float-breakpoint) {
@@ -213,7 +213,7 @@ dd {
       width: ($dl-horizontal-offset - 20);
       clear: left;
       text-align: right;
-      @include text-overflow();
+      @include text-overflow;
     }
     dd {
       margin-left: $dl-horizontal-offset;
@@ -290,12 +290,6 @@ blockquote.pull-right {
   }
 }
 
-// Quotes
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-
 // Addresses
 address {
   margin-bottom: $line-height-computed;

data/assets/stylesheets/bootstrap/_utilities.scss

@@ -7,10 +7,10 @@
 // -------------------------
 
 .clearfix {
-  @include clearfix();
+  @include clearfix;
 }
 .center-block {
-  @include center-block();
+  @include center-block;
 }
 .pull-right {
   float: right !important;
@@ -34,7 +34,7 @@
   visibility: hidden;
 }
 .text-hide {
-  @include text-hide();
+  @include text-hide;
 }
 
 
@@ -53,5 +53,4 @@
 
 .affix {
   position: fixed;
-  @include translate3d(0, 0, 0);
 }

data/assets/stylesheets/bootstrap/_variables.scss

@@ -12,13 +12,14 @@ $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")
 //
 //## Gray and brand colors for use across Bootstrap.
 
-$gray-darker:            lighten(#000, 13.5%) !default; // #222
-$gray-dark:              lighten(#000, 20%) !default;   // #333
-$gray:                   lighten(#000, 33.5%) !default; // #555
-$gray-light:             lighten(#000, 46.7%) !default; // #777
-$gray-lighter:           lighten(#000, 93.5%) !default; // #eee
-
-$brand-primary:         #428bca !default;
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$gray-dark:              lighten($gray-base, 20%) !default;   // #333
+$gray:                   lighten($gray-base, 33.5%) !default; // #555
+$gray-light:             lighten($gray-base, 46.7%) !default; // #777
+$gray-lighter:           lighten($gray-base, 93.5%) !default; // #eee
+
+$brand-primary:         darken(#428bca, 6.5%) !default;
 $brand-success:         #5cb85c !default;
 $brand-info:            #5bc0de !default;
 $brand-warning:         #f0ad4e !default;
@@ -38,6 +39,8 @@ $text-color:            $gray-dark !default;
 $link-color:            $brand-primary !default;
 //** Link hover color set via `darken()` function.
 $link-hover-color:      darken($link-color, 15%) !default;
+//** Link hover decoration.
+$link-hover-decoration: underline !default;
 
 
 //== Typography
@@ -189,13 +192,20 @@ $input-bg-disabled:              $gray-lighter !default;
 $input-color:                    $gray !default;
 //** `<input>` border color
 $input-border:                   #ccc !default;
-//** `<input>` border radius
+
+// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
+//** Default `.form-control` border radius
 $input-border-radius:            $border-radius-base !default;
+//** Large `.form-control` border radius
+$input-border-radius-large:      $border-radius-large !default;
+//** Small `.form-control` border radius
+$input-border-radius-small:      $border-radius-small !default;
+
 //** Border color for inputs on focus
 $input-border-focus:             #66afe9 !default;
 
 //** Placeholder text color
-$input-color-placeholder:        $gray-light !default;
+$input-color-placeholder:        #999 !default;
 
 //** Default `.form-control` height
 $input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
@@ -212,6 +222,9 @@ $input-group-addon-bg:           $gray-lighter !default;
 //** Border color for textual input addons
 $input-group-addon-border-color: $input-border !default;
 
+//** Disabled cursor for form controls and buttons.
+$cursor-disabled:                not-allowed !default;
+
 
 //== Dropdowns
 //
@@ -260,8 +273,7 @@ $zindex-dropdown:          1000 !default;
 $zindex-popover:           1060 !default;
 $zindex-tooltip:           1070 !default;
 $zindex-navbar-fixed:      1030 !default;
-$zindex-modal-background:  1040 !default;
-$zindex-modal:             1050 !default;
+$zindex-modal:             1040 !default;
 
 
 //== Media queries breakpoints
@@ -323,17 +335,17 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
 //## Define the maximum width of `.container` for different screen sizes.
 
 // Small screen / tablet
-$container-tablet:             ((720px + $grid-gutter-width)) !default;
+$container-tablet:             (720px + $grid-gutter-width) !default;
 //** For `$screen-sm-min` and up.
 $container-sm:                 $container-tablet !default;
 
 // Medium screen / desktop
-$container-desktop:            ((940px + $grid-gutter-width)) !default;
+$container-desktop:            (940px + $grid-gutter-width) !default;
 //** For `$screen-md-min` and up.
 $container-md:                 $container-desktop !default;
 
 // Large screen / wide desktop
-$container-large-desktop:      ((1140px + $grid-gutter-width)) !default;
+$container-large-desktop:      (1140px + $grid-gutter-width) !default;
 //** For `$screen-lg-min` and up.
 $container-lg:                 $container-large-desktop !default;
 
@@ -376,12 +388,12 @@ $navbar-default-toggle-border-color:       #ddd !default;
 
 // Inverted navbar
 // Reset inverted navbar basics
-$navbar-inverse-color:                      $gray-light !default;
+$navbar-inverse-color:                      lighten($gray-light, 15%) !default;
 $navbar-inverse-bg:                         #222 !default;
 $navbar-inverse-border:                     darken($navbar-inverse-bg, 10%) !default;
 
 // Inverted navbar links
-$navbar-inverse-link-color:                 $gray-light !default;
+$navbar-inverse-link-color:                 lighten($gray-light, 15%) !default;
 $navbar-inverse-link-hover-color:           #fff !default;
 $navbar-inverse-link-hover-bg:              transparent !default;
 $navbar-inverse-link-active-color:          $navbar-inverse-link-hover-color !default;
@@ -411,8 +423,6 @@ $nav-link-hover-bg:                         $gray-lighter !default;
 $nav-disabled-link-color:                   $gray-light !default;
 $nav-disabled-link-hover-color:             $gray-light !default;
 
-$nav-open-link-hover-color:                 #fff !default;
-
 //== Tabs
 $nav-tabs-border-color:                     #ddd !default;
 
@@ -537,7 +547,7 @@ $popover-title-bg:                    darken($popover-bg, 3%) !default;
 //** Popover arrow width
 $popover-arrow-width:                 10px !default;
 //** Popover arrow color
-$popover-arrow-color:                 #fff !default;
+$popover-arrow-color:                 $popover-bg !default;
 
 //** Popover outer arrow width
 $popover-arrow-outer-width:           ($popover-arrow-width + 1) !default;
@@ -636,6 +646,8 @@ $alert-danger-border:         $state-danger-border !default;
 $progress-bg:                 #f5f5f5 !default;
 //** Progress bar text color
 $progress-bar-color:          #fff !default;
+//** Variable for setting rounded corners on progress bar.
+$progress-border-radius:      $border-radius-base !default;
 
 //** Default progress bar color
 $progress-bar-bg:             $brand-primary !default;
@@ -850,5 +862,3 @@ $page-header-border-color:    $gray-lighter !default;
 $dl-horizontal-offset:        $component-offset-horizontal !default;
 //** Horizontal line color.
 $hr-border:                   $gray-lighter !default;
-
-

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

@@ -10,6 +10,7 @@
 
   &:hover,
   &:focus,
+  &.focus,
   &:active,
   &.active,
   .open > &.dropdown-toggle {
@@ -28,6 +29,7 @@
     &,
     &:hover,
     &:focus,
+    &.focus,
     &:active,
     &.active {
       background-color: $background;

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

@@ -10,7 +10,11 @@
   .radio,
   .checkbox,
   .radio-inline,
-  .checkbox-inline  {
+  .checkbox-inline,
+  &.radio label,
+  &.checkbox label,
+  &.radio-inline label,
+  &.checkbox-inline label  {
     color: $text-color;
   }
   // Set the border and box shadow on specific inputs to match