From 02ae73fc0fc21049ea4199dfda18c87c9b709e52 Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Mon, 1 May 2017 17:59:21 -0700 Subject: [PATCH 01/15] Apply `align-items: center;` to `.input-group` instead of input group sub components, causes `.input-group .form-control` and `.input-group-addon` to be large when next to a tall element --- scss/_input-group.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scss/_input-group.scss b/scss/_input-group.scss index 4d3fec656d..40bc50a537 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -5,6 +5,7 @@ .input-group { position: relative; display: flex; + align-items: center; width: 100%; .form-control { @@ -28,10 +29,6 @@ .input-group-addon, .input-group-btn, .input-group .form-control { - // Vertically centers the content of the addons within the input group - display: flex; - align-items: center; - &:not(:first-child):not(:last-child) { @include border-radius(0); } From 80cf395e4d8f91337cf28d8b85ca087b0ce3e8ae Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Mon, 1 May 2017 18:00:43 -0700 Subject: [PATCH 02/15] Remove `vertical-align: middle` from `.input-group-addon` and `.input-group-btn` left over from V3 --- scss/_input-group.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/scss/_input-group.scss b/scss/_input-group.scss index 40bc50a537..95b17be477 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -37,7 +37,6 @@ .input-group-addon, .input-group-btn { white-space: nowrap; - vertical-align: middle; // Match the inputs } From bde9c64ca9070f9da7825a59e7cce4842247ffd2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Aug 2017 17:13:53 -0700 Subject: [PATCH 03/15] Apply the invalid/valid state to the class name --- scss/mixins/_forms.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index 4a1e0bc311..67e198c26f 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -33,8 +33,8 @@ box-shadow: 0 0 0 .2rem rgba($color,.25); } - ~ .invalid-feedback, - ~ .invalid-tooltip { + ~ .#{$state}-feedback, + ~ .#{$state}-tooltip { display: block; } } From 3f36ac29fa149750b46cdc20fc5b7d8c58c856e9 Mon Sep 17 00:00:00 2001 From: Jason Etcovitch Date: Sun, 13 Aug 2017 01:00:59 -0700 Subject: [PATCH 04/15] Add npm install step to docs instructions (#23385) --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 96e26297b1..215d98b7c9 100644 --- a/README.md +++ b/README.md @@ -96,9 +96,10 @@ Documentation search is powered by [Algolia's DocSearch](https://community.algol ### Running documentation locally 1. Run through the [tooling setup](https://github.com/twbs/bootstrap/blob/v4-dev/docs/4.0/getting-started/build-tools.md#tooling-setup) to install Jekyll (the site builder) and other Ruby dependencies with `bundle install`. -2. Run `npm run test` (or a specific NPM script) to rebuild distributed CSS and JavaScript files, as well as our docs assets. -3. From the root `/bootstrap` directory, run `bundle exec jekyll serve` in the command line. -4. Open in your browser, and voilĂ . +2. Run `npm install` to install Node.js dependencies. +3. Run `npm run test` (or a specific NPM script) to rebuild distributed CSS and JavaScript files, as well as our docs assets. +4. From the root `/bootstrap` directory, run `bundle exec jekyll serve` in the command line. +5. Open in your browser, and voilĂ . Learn more about using Jekyll by reading its [documentation](https://jekyllrb.com/docs/home/). From b12d28c58e7d2abb2baac037940d63274f597336 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Sun, 13 Aug 2017 11:57:25 +0300 Subject: [PATCH 05/15] docs/4.0/examples/blog: Use ml-sm-auto instead of offset-sm-1 (#23388) Bootstrap 4.0 Beta 1 dropped the offset classes in favor of using margin utilities. Update the blog example in the docs to use the appropriate `ml-auto` instead of `offset-sm-1` class to retain a pixel perfect with previous versions. --- docs/4.0/examples/blog/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4.0/examples/blog/index.html b/docs/4.0/examples/blog/index.html index 0fc35ad3c0..a021d7afad 100644 --- a/docs/4.0/examples/blog/index.html +++ b/docs/4.0/examples/blog/index.html @@ -109,7 +109,7 @@ -
+