From b12fdcd48c26cee905c3365626247f452fb941f2 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sun, 3 Sep 2017 16:50:19 +0100 Subject: rake update[v4-dev] --- assets/stylesheets/bootstrap/_reboot.scss | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'assets/stylesheets/bootstrap/_reboot.scss') diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss index 33fc2d6..41f084b 100644 --- a/assets/stylesheets/bootstrap/_reboot.scss +++ b/assets/stylesheets/bootstrap/_reboot.scss @@ -18,8 +18,13 @@ // we force a non-overlapping, non-auto-hiding scrollbar to counteract. // 6. Change the default tap highlight to be completely transparent in iOS. -html { +*, +*::before, +*::after { box-sizing: border-box; // 1 +} + +html { font-family: sans-serif; // 2 line-height: 1.15; // 3 -webkit-text-size-adjust: 100%; // 4 @@ -28,12 +33,6 @@ html { -webkit-tap-highlight-color: rgba(0,0,0,0); // 6 } -*, -*::before, -*::after { - box-sizing: inherit; // 1 -} - // IE10+ doesn't honor `` in some cases. @at-root { @-ms-viewport { width: device-width; } @@ -48,6 +47,8 @@ article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, s // // 1. Remove the margin in all browsers. // 2. As a best practice, apply a default `background-color`. +// 3. Set an explicit initial text-align value so that we can later use the +// the `inherit` value on things like `` elements. body { margin: 0; // 1 @@ -56,6 +57,7 @@ body { font-weight: $font-weight-base; line-height: $line-height-base; color: $body-color; + text-align: left; // 3 background-color: $body-bg; // 2 } @@ -100,7 +102,7 @@ h1, h2, h3, h4, h5, h6 { // bottom margin to use `rem` units instead of `em`. p { margin-top: 0; - margin-bottom: 1rem; + margin-bottom: $paragraph-margin-bottom; } // Abbreviations @@ -270,7 +272,7 @@ svg:not(:root) { // DON'T remove the click delay when `` is present. // However, they DO support removing the click delay via `touch-action: manipulation`. // See: -// * https://v4-alpha.getbootstrap.com/content/reboot/#click-delay-optimization-for-touch +// * https://getbootstrap.com/docs/4.0/content/reboot/#click-delay-optimization-for-touch // * http://caniuse.com/#feat=css-touch-action // * https://patrickhlauke.github.io/touch/tests/results/#suppressing-300ms-delay @@ -278,7 +280,7 @@ a, area, button, [role="button"], -input, +input:not([type=range]), label, select, summary, @@ -304,8 +306,9 @@ caption { } th { - // Matches default `` alignment - text-align: left; + // Matches default `` alignment by inheriting from the ``, or the + // closest parent with a set `text-align`. + text-align: inherit; } -- cgit v1.2.3