diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /scss/_reboot.scss | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'scss/_reboot.scss')
| -rw-r--r-- | scss/_reboot.scss | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scss/_reboot.scss b/scss/_reboot.scss index de32aae2b..a4dc0398c 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -1,7 +1,7 @@ // Reboot // // Global resets to common HTML elements and more for easier usage by Bootstrap. -// Builds on the resets of Normalize.css. +// Adds additional rules on top of Normalize.css, including several overrides. // Reset the box-sizing @@ -22,8 +22,8 @@ html { } *, -*:before, -*:after { +*::before, +*::after { box-sizing: inherit; } @@ -146,7 +146,7 @@ blockquote { a { color: $link-color; - text-decoration: none; + text-decoration: $link-decoration; @include hover-focus { color: $link-hover-color; @@ -279,6 +279,8 @@ legend { } input[type="search"] { + // Undo Normalize's default here to match our global overrides. + box-sizing: inherit; // This overrides the extra rounded corners on search inputs in iOS so that our // `.form-control` class can properly style them. Note that this cannot simply // be added to `.form-control` as it's not specific enough. For details, see |