diff options
| author | Mark Otto <[email protected]> | 2015-01-06 16:06:06 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-06 16:06:06 -0800 |
| commit | 20cdb62200164c8e1c8c2b19dc7c62922b477a6f (patch) | |
| tree | 8522a28873ed84ba13145c304934d6ffb05900b9 /scss | |
| parent | b542137dd5bf39d6b9bfa7aef23dbbd5f04b1c43 (diff) | |
| parent | b361dacff13d0f410ddd15fdf343887c15134318 (diff) | |
| download | bootstrap-20cdb62200164c8e1c8c2b19dc7c62922b477a6f.tar.xz bootstrap-20cdb62200164c8e1c8c2b19dc7c62922b477a6f.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_scaffolding.scss | 7 | ||||
| -rw-r--r-- | scss/_utilities.scss | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index b5d767e64..bb867c615 100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@ -8,10 +8,15 @@ // Heads up! This reset may cause conflicts with some third-party widgets. // For recommendations on resolving such conflicts, see // http://getbootstrap.com/getting-started/#third-box-sizing +// Credit: Jon Neal & CSS-Tricks +// http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ +html { + box-sizing: border-box; +} *, *:before, *:after { - box-sizing: border-box; + box-sizing: inherit; } diff --git a/scss/_utilities.scss b/scss/_utilities.scss index 5e297fc75..09f569834 100644 --- a/scss/_utilities.scss +++ b/scss/_utilities.scss @@ -61,11 +61,6 @@ } -// For Affix plugin -.affix { - position: fixed; -} - // Alignment .text-left { text-align: left; } .text-right { text-align: right; } |