rake update[v4-dev]

glebm · glebm · commit cde73a8aea6e · 2015-11-03T08:02:31.000Z
diff --git a/assets/javascripts/bootstrap/alert.js b/assets/javascripts/bootstrap/alert.js
@@ -189,4 +189,3 @@ var Alert = (function ($) {
 
   return Alert;
 })(jQuery);
-//# sourceMappingURL=alert.js.map
diff --git a/assets/javascripts/bootstrap/button.js b/assets/javascripts/bootstrap/button.js
@@ -169,4 +169,3 @@ var Button = (function ($) {
 
   return Button;
 })(jQuery);
-//# sourceMappingURL=button.js.map
diff --git a/assets/javascripts/bootstrap/carousel.js b/assets/javascripts/bootstrap/carousel.js
@@ -475,4 +475,3 @@ var Carousel = (function ($) {
 
   return Carousel;
 })(jQuery);
-//# sourceMappingURL=carousel.js.map
diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap/collapse.js
@@ -361,4 +361,3 @@ var Collapse = (function ($) {
 
   return Collapse;
 })(jQuery);
-//# sourceMappingURL=collapse.js.map
diff --git a/assets/javascripts/bootstrap/dropdown.js b/assets/javascripts/bootstrap/dropdown.js
@@ -290,4 +290,3 @@ var Dropdown = (function ($) {
 
   return Dropdown;
 })(jQuery);
-//# sourceMappingURL=dropdown.js.map
diff --git a/assets/javascripts/bootstrap/modal.js b/assets/javascripts/bootstrap/modal.js
@@ -533,4 +533,3 @@ var Modal = (function ($) {
 
   return Modal;
 })(jQuery);
-//# sourceMappingURL=modal.js.map
diff --git a/assets/javascripts/bootstrap/popover.js b/assets/javascripts/bootstrap/popover.js
@@ -198,4 +198,3 @@ var Popover = (function ($) {
 
   return Popover;
 })(jQuery);
-//# sourceMappingURL=popover.js.map
diff --git a/assets/javascripts/bootstrap/scrollspy.js b/assets/javascripts/bootstrap/scrollspy.js
@@ -317,4 +317,3 @@ var ScrollSpy = (function ($) {
 
   return ScrollSpy;
 })(jQuery);
-//# sourceMappingURL=scrollspy.js.map
diff --git a/assets/javascripts/bootstrap/tab.js b/assets/javascripts/bootstrap/tab.js
@@ -260,4 +260,3 @@ var Tab = (function ($) {
 
   return Tab;
 })(jQuery);
-//# sourceMappingURL=tab.js.map
diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js
@@ -616,4 +616,3 @@ var Tooltip = (function ($) {
 
   return Tooltip;
 })(jQuery);
-//# sourceMappingURL=tooltip.js.map
diff --git a/assets/javascripts/bootstrap/util.js b/assets/javascripts/bootstrap/util.js
@@ -154,4 +154,3 @@ var Util = (function ($) {
 
   return Util;
 })(jQuery);
-//# sourceMappingURL=util.js.map
diff --git a/assets/stylesheets/_bootstrap.scss b/assets/stylesheets/_bootstrap.scss
@@ -51,5 +51,6 @@
 
 // Utility classes
 @import "bootstrap/utilities";
+@import "bootstrap/utilities-background";
 @import "bootstrap/utilities-spacing";
 @import "bootstrap/utilities-responsive";
diff --git a/assets/stylesheets/bootstrap/_utilities-background.scss b/assets/stylesheets/bootstrap/_utilities-background.scss
@@ -0,0 +1,24 @@
+//
+// Contextual backgrounds
+//
+
+// Inverse
+// TODO: redo this as a proper class
+.bg-inverse {
+  color: $gray-lighter;
+  background-color: $gray-dark;
+}
+
+.bg-faded {
+  background-color: $gray-lightest;
+}
+
+@include bg-variant('.bg-primary', $brand-primary);
+
+@include bg-variant('.bg-success', $brand-success);
+
+@include bg-variant('.bg-info', $brand-info);
+
+@include bg-variant('.bg-warning', $brand-warning);
+
+@include bg-variant('.bg-danger', $brand-danger);
diff --git a/assets/stylesheets/bootstrap/_utilities.scss b/assets/stylesheets/bootstrap/_utilities.scss
@@ -89,29 +89,3 @@
 @include text-emphasis-variant('.text-warning', $brand-warning);
 
 @include text-emphasis-variant('.text-danger', $brand-danger);
-
-
-// Contextual backgrounds
-// For now we'll leave these alongside the text classes until v4 when we can
-// safely shift things around (per SemVer rules).
-
-// Inverse
-// Todo: redo this as a proper class
-.bg-inverse {
-  color: $gray-lighter;
-  background-color: $gray-dark;
-}
-
-.bg-faded {
-  background-color: $gray-lightest;
-}
-
-@include bg-variant('.bg-primary', $brand-primary);
-
-@include bg-variant('.bg-success', $brand-success);
-
-@include bg-variant('.bg-info', $brand-info);
-
-@include bg-variant('.bg-warning', $brand-warning);
-
-@include bg-variant('.bg-danger', $brand-danger);
diff --git a/assets/stylesheets/bootstrap/mixins/_image.scss b/assets/stylesheets/bootstrap/mixins/_image.scss
@@ -21,12 +21,13 @@
 @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
   background-image: url($file-1x);
 
+  // Autoprefixer takes care of adding -webkit-min-device-pixel-ratio and -o-min-device-pixel-ratio,
+  // but doesn't convert dppx=>dpi.
+  // There's no such thing as unprefixed min-device-pixel-ratio since it's nonstandard.
+  // Compatibility info: http://caniuse.com/#feat=css-media-resolution
   @media
-  only screen and (-webkit-min-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-resolution: 192dpi), // IE9-11 don't support dppx
+  only screen and (min-resolution: 2dppx) { // Standardized
     background-image: url($file-2x);
     background-size: $width-1x $height-1x;
   }
diff --git a/lib/bootstrap/version.rb b/lib/bootstrap/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION       = '4.0.0.alpha1'
-  BOOTSTRAP_SHA = '43b130022b333c25d9fa810ab2666059ed699f7a'
+  BOOTSTRAP_SHA = 'bfa392b097a1d10844e61fb00957c5f8d9ea73ca'
 end

Original file line number	Diff line number	Diff line change
`@@ -189,4 +189,3 @@ var Alert = (function ($) {`
`189`	`189`
`190`	`190`	`return Alert;`
`191`	`191`	`})(jQuery);`
`192`		`-//# sourceMappingURL=alert.js.map`
Original file line number	Diff line number	Diff line change
`@@ -169,4 +169,3 @@ var Button = (function ($) {`
`169`	`169`
`170`	`170`	`return Button;`
`171`	`171`	`})(jQuery);`
`172`		`-//# sourceMappingURL=button.js.map`
Original file line number	Diff line number	Diff line change
`@@ -475,4 +475,3 @@ var Carousel = (function ($) {`
`475`	`475`
`476`	`476`	`return Carousel;`
`477`	`477`	`})(jQuery);`
`478`		`-//# sourceMappingURL=carousel.js.map`
Original file line number	Diff line number	Diff line change
`@@ -361,4 +361,3 @@ var Collapse = (function ($) {`
`361`	`361`
`362`	`362`	`return Collapse;`
`363`	`363`	`})(jQuery);`
`364`		`-//# sourceMappingURL=collapse.js.map`
Original file line number	Diff line number	Diff line change
`@@ -290,4 +290,3 @@ var Dropdown = (function ($) {`
`290`	`290`
`291`	`291`	`return Dropdown;`
`292`	`292`	`})(jQuery);`
`293`		`-//# sourceMappingURL=dropdown.js.map`
Original file line number	Diff line number	Diff line change
`@@ -533,4 +533,3 @@ var Modal = (function ($) {`
`533`	`533`
`534`	`534`	`return Modal;`
`535`	`535`	`})(jQuery);`
`536`		`-//# sourceMappingURL=modal.js.map`
Original file line number	Diff line number	Diff line change
`@@ -198,4 +198,3 @@ var Popover = (function ($) {`
`198`	`198`
`199`	`199`	`return Popover;`
`200`	`200`	`})(jQuery);`
`201`		`-//# sourceMappingURL=popover.js.map`
Original file line number	Diff line number	Diff line change
`@@ -317,4 +317,3 @@ var ScrollSpy = (function ($) {`
`317`	`317`
`318`	`318`	`return ScrollSpy;`
`319`	`319`	`})(jQuery);`
`320`		`-//# sourceMappingURL=scrollspy.js.map`
Original file line number	Diff line number	Diff line change
`@@ -260,4 +260,3 @@ var Tab = (function ($) {`
`260`	`260`
`261`	`261`	`return Tab;`
`262`	`262`	`})(jQuery);`
`263`		`-//# sourceMappingURL=tab.js.map`
Original file line number	Diff line number	Diff line change
`@@ -616,4 +616,3 @@ var Tooltip = (function ($) {`
`616`	`616`
`617`	`617`	`return Tooltip;`
`618`	`618`	`})(jQuery);`
`619`		`-//# sourceMappingURL=tooltip.js.map`