From ae6440a48057807abf2ac80233a2fc9758ca3161 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Jun 2017 09:32:26 -0700 Subject: [PATCH 01/28] clarify now that custom is gone --- docs/4.0/getting-started/options.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/4.0/getting-started/options.md b/docs/4.0/getting-started/options.md index acc7ce451c..7046f71894 100644 --- a/docs/4.0/getting-started/options.md +++ b/docs/4.0/getting-started/options.md @@ -8,16 +8,11 @@ toc: true ## Customizing variables -Bootstrap 4 ships with a `_custom.scss` file for easy overriding of default variables in `/scss/_variables.scss`. Copy and paste relevant lines from there into the `_custom.scss` file, modify the values, and recompile your Sass to change our default values. **Be sure to remove the `!default` flag from override values.** +Every Sass variable in Bootstrap 4 includes the `!default` flag, meaning you can override that default value in your own Sass even after that original variable's been defined. Copy and paste variables as needed, modify the values, remove the `!default` flag, and recompile. For example, to change out the `background-color` and `color` for the ``, you'd do the following: {% highlight scss %} -// Bootstrap overrides -// -// Copy variables from `_variables.scss` to this file to override default values -// without modifying source files. - $body-bg: $gray-dark; $body-color: $gray-light; {% endhighlight %} From 42d614347e3965391fe73551a22eb002e98fbac1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Jun 2017 20:28:14 -0700 Subject: [PATCH 02/28] fix broken button --- docs/4.0/getting-started/download.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4.0/getting-started/download.md b/docs/4.0/getting-started/download.md index 9af5392701..b3338f6baf 100644 --- a/docs/4.0/getting-started/download.md +++ b/docs/4.0/getting-started/download.md @@ -12,7 +12,7 @@ toc: true **Current version:** v{{ site.current_version}} -Download Bootstrap +Download Bootstrap ## Source files **Want to compile Bootstrap with your project's asset pipeline?** Choose this option to download our source Sass, JavaScript, and documentation files. Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes), and [some setup]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/build-tools/#tooling-setup). From 54ee882e50e3f0c989fc78e1bda75d186095d05b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Jun 2017 20:30:02 -0700 Subject: [PATCH 03/28] redo intro --- docs/4.0/getting-started/options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4.0/getting-started/options.md b/docs/4.0/getting-started/options.md index 7046f71894..30ef80c0c5 100644 --- a/docs/4.0/getting-started/options.md +++ b/docs/4.0/getting-started/options.md @@ -1,7 +1,7 @@ --- layout: docs title: Customization options -description: Customize Bootstrap 4 with our built-in custom variables file and easily toggle global CSS preferences with new Sass variables. +description: Customize Bootstrap 4 with our new built-in Sass variables for global style preferences for easy theming and component changes. group: getting-started toc: true --- From 11a5ca8ff3b943ba5655400971415ff29f6896a8 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Fri, 16 Jun 2017 10:50:31 +0200 Subject: [PATCH 04/28] Add back js-lint when we try to build our js --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bedd027e1f..b29d1067bd 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "css-prefix-docs": "postcss --config build/ --no-map --replace assets/css/docs.min.css", "css-minify": "cleancss --level 1 --source-map --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", "css-minify-docs": "cleancss --level 1 --source-map --output assets/css/docs.min.css assets/css/docs.min.css", - "js": "npm-run-all js-compile js-minify", + "js": "npm-run-all js-lint js-compile js-minify", "js-docs": "npm-run-all js-lint-docs js-minify-docs", "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/ Gruntfile.js", "js-lint-docs": "eslint --config js/tests/.eslintrc.json assets/js/", @@ -54,7 +54,7 @@ "dist": "npm-run-all --parallel css js", "test": "npm-run-all dist js-test docs", "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs\"", - "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile\"", + "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile-plugins\"", "watch": "npm-run-all --parallel watch-css watch-js" }, "style": "dist/css/bootstrap.css", From 6ed8a735d02fe7bd71a3bf5c520891d2157cec30 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Fri, 16 Jun 2017 10:51:22 +0200 Subject: [PATCH 05/28] fix some errors in our js --- js/src/dropdown.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/js/src/dropdown.js b/js/src/dropdown.js index acc3ed453a..4ed0210a54 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -250,12 +250,10 @@ const Dropdown = (($) => { if ($(this._menu).hasClass(ClassName.MENURIGHT)) { placement = AttachmentMap.TOPEND } + } else if ($(this._menu).hasClass(ClassName.MENURIGHT)) { + placement = AttachmentMap.BOTTOMEND } - else { - if ($(this._menu).hasClass(ClassName.MENURIGHT)) { - placement = AttachmentMap.BOTTOMEND - } - } + return placement } From 9f0929013e0c4e5c21acbb7a7e8298c345ea4cac Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Fri, 16 Jun 2017 16:57:15 -0700 Subject: [PATCH 06/28] (#22414) Rename for consistency `$list-group-link-*-*` to `$list-group-action-*-*` --- scss/_list-group.scss | 8 ++++---- scss/_variables.scss | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scss/_list-group.scss b/scss/_list-group.scss index fef2c1532a..96fd6f0195 100644 --- a/scss/_list-group.scss +++ b/scss/_list-group.scss @@ -19,19 +19,19 @@ .list-group-item-action { width: 100%; // For `