rake update[v4-dev]

Author: glebm

assets/javascripts/bootstrap-sprockets.js

@@ -1,11 +1,11 @@
 //= require ./bootstrap/util
-//= require ./bootstrap/alert
-//= require ./bootstrap/dropdown
-//= require ./bootstrap/tab
-//= require ./bootstrap/modal
 //= require ./bootstrap/tooltip
 //= require ./bootstrap/popover
+//= require ./bootstrap/alert
 //= require ./bootstrap/carousel
-//= require ./bootstrap/button
+//= require ./bootstrap/dropdown
+//= require ./bootstrap/modal
+//= require ./bootstrap/tab
 //= require ./bootstrap/scrollspy
 //= require ./bootstrap/collapse
+//= require ./bootstrap/button

assets/stylesheets/bootstrap/_alert.scss

@@ -27,6 +27,8 @@
 // Expand the right padding and account for the close button's positioning.
 
 .alert-dismissible {
+  padding-right: ($close-font-size + $alert-padding-x * 2);
+
   // Adjust close link position
   .close {
     position: absolute;

assets/stylesheets/bootstrap/_button-group.scss

@@ -14,12 +14,12 @@
     // Bring the hover, focused, and "active" buttons to the front to overlay
     // the borders properly
     @include hover {
-      z-index: 2;
+      z-index: 1;
     }
     &:focus,
     &:active,
     &.active {
-      z-index: 2;
+      z-index: 1;
     }
   }
 
@@ -43,47 +43,50 @@
   }
 }
 
-.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
-  border-radius: 0;
-}
+.btn-group {
+  > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+    border-radius: 0;
+  }
 
-// Set corners individual because sometimes a single button can be in a .btn-group
-// and we need :first-child and :last-child to both match
-.btn-group > .btn:first-child {
-  margin-left: 0;
+  // Set corners individual because sometimes a single button can be in a .btn-group
+  // and we need :first-child and :last-child to both match
+  > .btn:first-child {
+    margin-left: 0;
 
-  &:not(:last-child):not(.dropdown-toggle) {
-    @include border-right-radius(0);
+    &:not(:last-child):not(.dropdown-toggle) {
+      @include border-right-radius(0);
+    }
   }
-}
-// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu
-// immediately after it
-.btn-group > .btn:last-child:not(:first-child),
-.btn-group > .dropdown-toggle:not(:first-child) {
-  @include border-left-radius(0);
-}
 
-// Custom edits for including btn-groups within btn-groups (useful for including
-// dropdown buttons within a btn-group)
-.btn-group > .btn-group {
-  float: left;
-}
 
-.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
-  border-radius: 0;
-}
+  // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu
+  // immediately after it
+  > .btn:last-child:not(:first-child),
+  > .dropdown-toggle:not(:first-child) {
+    @include border-left-radius(0);
+  }
 
-.btn-group > .btn-group:first-child:not(:last-child) {
-  > .btn:last-child,
-  > .dropdown-toggle {
-    @include border-right-radius(0);
+  // Custom edits for including btn-groups within btn-groups (useful for including
+  // dropdown buttons within a btn-group)
+  > .btn-group {
+    float: left;
   }
-}
 
-.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
-  @include border-left-radius(0);
-}
+  > .btn-group:not(:first-child):not(:last-child) > .btn {
+    border-radius: 0;
+  }
+
+  > .btn-group:first-child:not(:last-child) {
+    > .btn:last-child,
+    > .dropdown-toggle {
+      @include border-right-radius(0);
+    }
+  }
 
+  > .btn-group:last-child:not(:first-child) > .btn:first-child {
+    @include border-left-radius(0);
+  }
+}
 
 // Sizing
 //
@@ -197,10 +200,12 @@
 [data-toggle="buttons"] {
   > .btn,
   > .btn-group > .btn {
+    margin-bottom: 0; // Override default `<label>` value
+
     input[type="radio"],
     input[type="checkbox"] {
       position: absolute;
-      clip: rect(0,0,0,0);
+      clip: rect(0, 0, 0, 0);
       pointer-events: none;
     }
   }

assets/stylesheets/bootstrap/_buttons.scss

@@ -119,11 +119,11 @@ fieldset[disabled] a.btn {
 .btn-block {
   display: block;
   width: 100%;
-}
 
-// Vertically space out multiple block buttons
-.btn-block + .btn-block {
-  margin-top: $btn-block-spacing-y;
+  // Vertically space out multiple block buttons
+  + .btn-block {
+    margin-top: $btn-block-spacing-y;
+  }
 }
 
 // Specificity overrides

assets/stylesheets/bootstrap/_card.scss

@@ -194,42 +194,50 @@
         &:first-child {
           @include border-right-radius(0);
 
-          .card-img-top {
+          .card-img-top,
+          .card-header {
             border-top-right-radius: 0;
           }
-          .card-img-bottom {
+          .card-img-bottom,
+          .card-footer {
             border-bottom-right-radius: 0;
           }
         }
 
         &:last-child {
           @include border-left-radius(0);
 
-          .card-img-top {
+          .card-img-top,
+          .card-header {
             border-top-left-radius: 0;
           }
-          .card-img-bottom {
+          .card-img-bottom,
+          .card-footer {
             border-bottom-left-radius: 0;
           }
         }
 
         &:only-child {
           @include border-radius($card-border-radius);
 
-          .card-img-top {
+          .card-img-top,
+          .card-header {
             @include border-top-radius($card-border-radius);
           }
-          .card-img-bottom {
+          .card-img-bottom,
+          .card-footer {
             @include border-bottom-radius($card-border-radius);
           }
         }
 
         &:not(:first-child):not(:last-child):not(:only-child) {
-          border-radius: 0;
+          @include border-radius(0);
 
           .card-img-top,
-          .card-img-bottom {
-            border-radius: 0;
+          .card-img-bottom,
+          .card-header,
+          .card-footer {
+            @include border-radius(0);
           }
         }
       }

assets/stylesheets/bootstrap/_carousel.scss

@@ -91,13 +91,13 @@
 .carousel-control-prev {
   left: 0;
   @if $enable-gradients {
-    background: linear-gradient(90deg, rgba(0,0,0,.25), rgba(0,0,0,.001));
+    background: linear-gradient(90deg, rgba(0, 0, 0, .25), rgba(0, 0, 0, .001));
   }
 }
 .carousel-control-next {
   right: 0;
   @if $enable-gradients {
-    background: linear-gradient(270deg, rgba(0,0,0,.25), rgba(0,0,0,.001));
+    background: linear-gradient(270deg, rgba(0, 0, 0, .25), rgba(0, 0, 0, .001));
   }
 }
 

assets/stylesheets/bootstrap/_code.scss

@@ -42,8 +42,6 @@ kbd {
 // Blocks of code
 pre {
   display: block;
-  margin-top: 0;
-  margin-bottom: 1rem;
   font-size: $code-font-size;
   color: $pre-color;
 
@@ -53,7 +51,7 @@ pre {
     font-size: inherit;
     color: inherit;
     background-color: transparent;
-    border-radius: 0;
+    @include border-radius(0);
   }
 }
 

assets/stylesheets/bootstrap/_dropdown.scss

@@ -27,7 +27,7 @@
   background-color: $dropdown-bg;
   background-clip: padding-box;
   border: $dropdown-border-width solid $dropdown-border-color;
-  @include border-radius($border-radius);
+  @include border-radius($dropdown-border-radius);
   @include box-shadow($dropdown-box-shadow);
 }
 

assets/stylesheets/bootstrap/_forms.scss

@@ -12,8 +12,6 @@
   line-height: $input-btn-line-height;
   color: $input-color;
   background-color: $input-bg;
-  // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.
-  background-image: none;
   background-clip: padding-box;
   border: $input-btn-border-width solid $input-border-color;
 
@@ -129,6 +127,8 @@ select.form-control {
 // text (without any border, background color, focus indicator)
 
 .form-control-plaintext {
+  display: block;
+  width: 100%;
   padding-top: $input-btn-padding-y;
   padding-bottom: $input-btn-padding-y;
   margin-bottom: 0; // match inputs if this class comes on inputs with default margins

assets/stylesheets/bootstrap/_functions.scss

@@ -57,9 +57,9 @@
   $yiq: (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
 
   @if ($yiq >= 150) {
-    @return #111;
+    @return $yiq-text-dark;
   } @else {
-    @return #fff;
+    @return $yiq-text-light;
   }
 }