From cde73a8aea6ec8059cc23b0d75e8caae77ffef2c Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 3 Nov 2015 08:02:31 +0000 Subject: rake update[v4-dev] --- assets/javascripts/bootstrap/alert.js | 1 - assets/javascripts/bootstrap/button.js | 1 - assets/javascripts/bootstrap/carousel.js | 1 - assets/javascripts/bootstrap/collapse.js | 1 - assets/javascripts/bootstrap/dropdown.js | 1 - assets/javascripts/bootstrap/modal.js | 1 - assets/javascripts/bootstrap/popover.js | 1 - assets/javascripts/bootstrap/scrollspy.js | 1 - assets/javascripts/bootstrap/tab.js | 1 - assets/javascripts/bootstrap/tooltip.js | 1 - assets/javascripts/bootstrap/util.js | 1 - assets/stylesheets/_bootstrap.scss | 1 + .../bootstrap/_utilities-background.scss | 24 ++++++++++++++++++++ assets/stylesheets/bootstrap/_utilities.scss | 26 ---------------------- assets/stylesheets/bootstrap/mixins/_image.scss | 11 ++++----- 15 files changed, 31 insertions(+), 42 deletions(-) create mode 100644 assets/stylesheets/bootstrap/_utilities-background.scss (limited to 'assets') diff --git a/assets/javascripts/bootstrap/alert.js b/assets/javascripts/bootstrap/alert.js index 27f44ed..0a9d1eb 100644 --- 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 index 3158f46..8e5031e 100644 --- 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 index ea99cad..f2309b6 100644 --- 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 index 27277b6..987f6e6 100644 --- 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 index e533eb7..b84e1ac 100644 --- 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 index 4b144ef..2509c65 100644 --- 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 index b4b8dac..77af5df 100644 --- 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 index 612f201..1e96344 100644 --- 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 index 74acd9c..0e1af1a 100644 --- 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 index 00a949d..445ca6e 100644 --- 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 index 934bad6..fc221e0 100644 --- 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 index f98c70c..4d9a41a 100644 --- 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 new file mode 100644 index 0000000..4bbf731 --- /dev/null +++ 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 index fa3b6e1..ea04f9a 100644 --- 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 index db590e3..91d2f59 100644 --- 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; } -- cgit v1.2.3