From dc5a096e0355cbc8e313677ad16b0e9fbe301f3c Mon Sep 17 00:00:00 2001 From: Vohmyanin Sergey Vasilevich Date: Thu, 19 Oct 2017 09:01:26 +0300 Subject: [PATCH 1/3] Enable sourcemaps for bundles and include sourcemap for plugins in npm package. (#24303) --- package.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c6e9c4b03a..2e533f8731 100644 --- a/package.json +++ b/package.json @@ -36,12 +36,12 @@ "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/", "js-lint-docs": "eslint --config js/tests/.eslintrc.json assets/js/ docs/ sw.js", "js-compile": "npm-run-all --parallel js-compile-*", - "js-compile-standalone": "cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js", - "js-compile-bundle": "cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js", + "js-compile-standalone": "cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap", + "js-compile-bundle": "cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap", "js-compile-plugins": "cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps", "js-minify": "npm-run-all --parallel js-minify-*", - "js-minify-standalone": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --output dist/js/bootstrap.min.js dist/js/bootstrap.js", - "js-minify-bundle": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js", + "js-minify-standalone": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map\" --output dist/js/bootstrap.min.js dist/js/bootstrap.js", + "js-minify-bundle": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map\" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js", "js-minify-docs": "uglifyjs --mangle --comments \"/^!/\" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js", "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60", "js-test-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & node build/saucelabs-unit-test.js", @@ -125,6 +125,7 @@ "build", "js/.eslintrc.json", "js/**/*.js", + "js/**/*.js.map", "scss/**/*.scss" ], "browserslist": [ From bee20c04e884fd40e40bd1802d10ce70e0ebd390 Mon Sep 17 00:00:00 2001 From: Andres Galante Date: Thu, 19 Oct 2017 03:05:00 -0300 Subject: [PATCH 2/3] Move theme variables outside of the theme map. (#23918) --- scss/_variables.scss | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 3d78f0b8ae..af0846806e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -62,16 +62,25 @@ $colors: map-merge(( "gray-dark": $gray-800 ), $colors); +$primary: $blue !default; +$secondary: $gray-600 !default; +$success: $green !default; +$info: $cyan !default; +$warning: $yellow !default; +$danger: $red !default; +$light: $gray-100 !default; +$dark: $gray-800 !default; + $theme-colors: () !default; $theme-colors: map-merge(( - "primary": $blue, - "secondary": $gray-600, - "success": $green, - "info": $cyan, - "warning": $yellow, - "danger": $red, - "light": $gray-100, - "dark": $gray-800 + "primary": $primary, + "secondary": $secondary, + "success": $success, + "info": $info, + "warning": $warning, + "danger": $danger, + "light": $light, + "dark": $dark ), $theme-colors); // stylelint-enable From 39b144c88fb6a664940981690bd60b2bd4ef9d37 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Oct 2017 23:16:18 -0700 Subject: [PATCH 3/3] Update docs for IE10+IE11 support of auto margins (#24427) IE10 and IE11 do not properly support the use of margin-auto on flex parents with a justify-content value other than flex-start. This PR removes the examples showcasing those two classes at play together in favor of simpler ones with _just_ the margin-auto utilities. More details can be found at https://stackoverflow.com/a/37535548, which has been linked to from the docs as well. Closes #24319 and closes #24413. --- docs/4.0/utilities/flex.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/4.0/utilities/flex.md b/docs/4.0/utilities/flex.md index 1d28fab6dd..c9aa5d2997 100644 --- a/docs/4.0/utilities/flex.md +++ b/docs/4.0/utilities/flex.md @@ -215,20 +215,24 @@ Responsive variations also exist for `align-self`. ## Auto margins -Flexbox can do some pretty awesome things when you mix flex alignments with auto margins. +Flexbox can do some pretty awesome things when you mix flex alignments with auto margins. Shown below is are three examples of controlling flex items via auto margins: default (no auto margin), pushing two items to the right (`.mr-auto`), and pushing two items to the left (`.ml-auto`). -### With justify-content - -Easily move all flex items to one side, but keep another on the opposite end by mixing `justify-content` with `margin-right: auto` or `margin-left: auto`. +**Unfortunately, IE10 and IE11 do not properly support auto margins on flex items whose parent has a non-default `justify-content` value.** [See this StackOverflow answer](https://stackoverflow.com/a/37535548) for more details. {% example html %} -
+
+
Flex item
+
Flex item
+
Flex item
+
+ +
Flex item
Flex item
Flex item
-
+
Flex item
Flex item
Flex item
@@ -237,7 +241,7 @@ Easily move all flex items to one side, but keep another on the opposite end by ### With align-items -Similarly, move one flex item to the top or bottom of a container by mixing `align-items`, `flex-direction: column`, and `margin-top: auto` or `margin-bottom: auto`. +Vertically move one flex item to the top or bottom of a container by mixing `align-items`, `flex-direction: column`, and `margin-top: auto` or `margin-bottom: auto`. {% example html %}