From 23e746d479f3098448d76ccafc9c2d77019c2562 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Nov 2015 17:23:16 -0800 Subject: [PATCH 01/11] nuke unhelpful comments --- scss/_responsive-embed.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/scss/_responsive-embed.scss b/scss/_responsive-embed.scss index ac4dc743a0..aaf8c04708 100644 --- a/scss/_responsive-embed.scss +++ b/scss/_responsive-embed.scss @@ -22,17 +22,14 @@ } } -// Modifier class for 21:9 aspect ratio .embed-responsive-21by9 { padding-bottom: percentage(9 / 21); } -// Modifier class for 16:9 aspect ratio .embed-responsive-16by9 { padding-bottom: percentage(9 / 16); } -// Modifier class for 4:3 aspect ratio .embed-responsive-4by3 { padding-bottom: percentage(3 / 4); } From e10104cc35672db77747c8b1622136555501bdc7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Nov 2015 19:21:25 -0800 Subject: [PATCH 02/11] Add note to build tools docs section about autoprefixer --- docs/getting-started/build-tools.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/getting-started/build-tools.md b/docs/getting-started/build-tools.md index 9b84a125d0..af0d7168ee 100644 --- a/docs/getting-started/build-tools.md +++ b/docs/getting-started/build-tools.md @@ -47,6 +47,12 @@ For example, run `TWBS_SASS=sass grunt` to test and build Bootstrap with Ruby Sa [libsass]: https://github.com/sass/libsass [grunt-sass]: https://github.com/sindresorhus/grunt-sass +## Autoprefixer + +Bootstrap uses [Autoprefixer][autoprefixer] (included in our Gruntfile and build process) to automatically add vendor prefixes to some CSS properties at build time. Doing so saves us time and code by allowing us to write key parts of our CSS a single time while eliminating the need for vendor mixins like those found in v3. + +[autoprefixer]: https://github.com/postcss/autoprefixer + ## Local documentation Running our documentation locally requires the use of Jekyll, a decently flexible static site generator that provides us basic includes, Markdown-based files, templates, and more. Here's how to get it started: From 0462cd3d8122047fe82edc62c7f12fe39ade3f1c Mon Sep 17 00:00:00 2001 From: Zac Echola Date: Thu, 20 Aug 2015 10:55:15 -0500 Subject: [PATCH 03/11] Simplifies markup for checkbox validation states --- docs/components/forms.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/docs/components/forms.md b/docs/components/forms.md index 031dc83a8e..3d2764f921 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -561,21 +561,17 @@ Ensure that an alternative indication of state is also provided. For instance, y -
-
- -
+
+
-
-
- -
+
+
@@ -584,6 +580,11 @@ Ensure that an alternative indication of state is also provided. For instance, y Checkbox with error
+
+
{% endexample %} From 9e01f45656e13dc31c9e29bf01682d3004039f7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Nov 2015 19:28:14 -0800 Subject: [PATCH 04/11] consolidate links at the bottom of the file --- docs/getting-started/build-tools.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/getting-started/build-tools.md b/docs/getting-started/build-tools.md index af0d7168ee..b54a568efc 100644 --- a/docs/getting-started/build-tools.md +++ b/docs/getting-started/build-tools.md @@ -42,16 +42,10 @@ Bootstrap will be compiled with [libsass][libsass] by default, but you can opt i For example, run `TWBS_SASS=sass grunt` to test and build Bootstrap with Ruby Sass. -[ruby-sass]: https://github.com/sass/sass -[grunt-contrib-sass]: https://github.com/gruntjs/grunt-contrib-sass -[libsass]: https://github.com/sass/libsass -[grunt-sass]: https://github.com/sindresorhus/grunt-sass - ## Autoprefixer Bootstrap uses [Autoprefixer][autoprefixer] (included in our Gruntfile and build process) to automatically add vendor prefixes to some CSS properties at build time. Doing so saves us time and code by allowing us to write key parts of our CSS a single time while eliminating the need for vendor mixins like those found in v3. -[autoprefixer]: https://github.com/postcss/autoprefixer ## Local documentation @@ -66,3 +60,9 @@ Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com ## Troubleshooting Should you encounter problems with installing dependencies or running Grunt commands, uninstall all previous dependency versions (global and local). Then, rerun `npm install`. + +[ruby-sass]: https://github.com/sass/sass +[grunt-contrib-sass]: https://github.com/gruntjs/grunt-contrib-sass +[libsass]: https://github.com/sass/libsass +[grunt-sass]: https://github.com/sindresorhus/grunt-sass +[autoprefixer]: https://github.com/postcss/autoprefixer From bbdd39300310bf236a17bc196972c43a3374f97f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Nov 2015 19:28:45 -0800 Subject: [PATCH 05/11] contextual shoutout --- docs/getting-started/build-tools.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started/build-tools.md b/docs/getting-started/build-tools.md index b54a568efc..b029b3dd56 100644 --- a/docs/getting-started/build-tools.md +++ b/docs/getting-started/build-tools.md @@ -28,7 +28,7 @@ Our Gruntfile includes the following commands and tasks: | Task | Description | | --- | --- | | `grunt` | Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Sass](http://sass-lang.com/) and [UglifyJS](http://lisperator.net/uglifyjs/).** | -| `grunt dist` | `grunt dist` creates the `/dist` directory with compiled files. **Uses [Sass](http://sass-lang.com/) and [UglifyJS](http://lisperator.net/uglifyjs/).** | +| `grunt dist` | `grunt dist` creates the `/dist` directory with compiled files. **Uses [Sass](http://sass-lang.com/), [Autoprefixer][autoprefixer] and [UglifyJS](http://lisperator.net/uglifyjs/).** | | `grunt test` | Runs [scss-lint](https://github.com/brigade/scss-lint), [ESLint](http://eslint.org/) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). | | `grunt docs` | Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via `jekyll serve`. | | `grunt watch` | This is a convenience method for watching just Sass files and automatically building them whenever you save. | From 37c2681e9f24d9fcadedfe8fa5685972718956dc Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 19:31:41 -0800 Subject: [PATCH 06/11] One more Autoprefixer shoutout [skip sauce] --- docs/getting-started/build-tools.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting-started/build-tools.md b/docs/getting-started/build-tools.md index b029b3dd56..0dabd30f92 100644 --- a/docs/getting-started/build-tools.md +++ b/docs/getting-started/build-tools.md @@ -27,8 +27,8 @@ Our Gruntfile includes the following commands and tasks: | Task | Description | | --- | --- | -| `grunt` | Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Sass](http://sass-lang.com/) and [UglifyJS](http://lisperator.net/uglifyjs/).** | -| `grunt dist` | `grunt dist` creates the `/dist` directory with compiled files. **Uses [Sass](http://sass-lang.com/), [Autoprefixer][autoprefixer] and [UglifyJS](http://lisperator.net/uglifyjs/).** | +| `grunt` | Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Sass](http://sass-lang.com/), [Autoprefixer][autoprefixer], and [UglifyJS](http://lisperator.net/uglifyjs/).** | +| `grunt dist` | `grunt dist` creates the `/dist` directory with compiled files. **Uses [Sass](http://sass-lang.com/), [Autoprefixer][autoprefixer], and [UglifyJS](http://lisperator.net/uglifyjs/).** | | `grunt test` | Runs [scss-lint](https://github.com/brigade/scss-lint), [ESLint](http://eslint.org/) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). | | `grunt docs` | Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via `jekyll serve`. | | `grunt watch` | This is a convenience method for watching just Sass files and automatically building them whenever you save. | From 54a964ae194e544a8d58b25fe377681e137cbbd6 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 19:35:45 -0800 Subject: [PATCH 07/11] s/error/danger/ [skip sauce] --- docs/components/forms.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/forms.md b/docs/components/forms.md index 031dc83a8e..563739fb29 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -557,7 +557,7 @@ Ensure that an alternative indication of state is also provided. For instance, y
- +
From f712e922d1e52ef05701de913ee5719b58af4ee2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Nov 2015 19:45:35 -0800 Subject: [PATCH 08/11] unfuck that class name change --- docs/components/forms.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/components/forms.md b/docs/components/forms.md index e148c6102d..d9e5b91d9f 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -535,7 +535,7 @@ Block help text—for below inputs or for longer lines of help text—can be eas ## Validation -Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-danger`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles. +Bootstrap includes validation styles for danger, warning, and success states on form controls. To use, add `.has-warning`, `.has-danger`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles. {% comment %} {% callout warning %} @@ -557,8 +557,8 @@ Ensure that an alternative indication of state is also provided. For instance, y
- - + +
@@ -576,14 +576,14 @@ Ensure that an alternative indication of state is also provided. For instance, y
{% endexample %} From 925f0ca0184cd6fd64efa91273f5ea495c18b34f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Nov 2015 19:45:48 -0800 Subject: [PATCH 09/11] fix error to danger --- scss/_forms.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_forms.scss b/scss/_forms.scss index 1d31848428..8796cbb773 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -261,7 +261,7 @@ input[type="checkbox"] { .form-control-success, .form-control-warning, -.form-control-error { +.form-control-danger { padding-right: ($input-padding-x * 3); background-repeat: no-repeat; background-position: center right ($input-height * .25); @@ -288,7 +288,7 @@ input[type="checkbox"] { .has-danger { @include form-control-validation($brand-danger); - .form-control-error { + .form-control-danger { background-image: url($form-icon-danger); } } From 9e23bbc1bce07be2a14cc3cb8e6ca4a09a030bd6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Nov 2015 19:46:03 -0800 Subject: [PATCH 10/11] fix broke markup --- docs/components/forms.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/components/forms.md b/docs/components/forms.md index d9e5b91d9f..e274b8bb46 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -573,13 +573,6 @@ Ensure that an alternative indication of state is also provided. For instance, y Checkbox with warning
-
-
- -