From 585f857e71176e0902490d6447419f1246ed2f5c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Apr 2015 17:12:19 -0700 Subject: rename scaffolding to reboot --- scss/_reboot.scss | 103 +++++++++++++++++++++++++++++++++++++++++++++++++ scss/_scaffolding.scss | 103 ------------------------------------------------- scss/bootstrap.scss | 2 +- 3 files changed, 104 insertions(+), 104 deletions(-) create mode 100644 scss/_reboot.scss delete mode 100644 scss/_scaffolding.scss diff --git a/scss/_reboot.scss b/scss/_reboot.scss new file mode 100644 index 000000000..5217539a3 --- /dev/null +++ b/scss/_reboot.scss @@ -0,0 +1,103 @@ +// +// Scaffolding +// -------------------------------------------------- + + +// Reset the box-sizing +// +// 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: inherit; +} + + +// Make viewport responsive +// +// @viewport is supposed to eventually replace . It's manually prefixed for forward-compatibility. +// +// @viewport is also needed because IE 10+ doesn't honor in some cases. +// (See http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/) +// +// However, `device-width` is broken on IE 10 on Windows (Phone) 8, +// (see http://timkadlec.com/2013/01/windows-phone-8-and-device-width/ +// and https://github.com/twbs/bootstrap/issues/10497) +// and the fix for that involves a snippet of JavaScript to sniff the user agent and apply some conditional CSS. +// See http://getbootstrap.com/getting-started/#support-ie10-width for the relevant hack. + +@-moz-viewport { width: device-width; } +@-ms-viewport { width: device-width; } +@-o-viewport { width: device-width; } +@-webkit-viewport { width: device-width; } +@viewport { width: device-width; } + + +// Reset HTML, body, and more + +html { + font-size: $font-size-root; + -webkit-tap-highlight-color: rgba(0,0,0,0); +} + +body { + font-family: $font-family-base; + font-size: $font-size-base; + line-height: $line-height-base; + color: $text-color; + background-color: $body-bg; +} + +input, +button, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} + + +// Links + +a { + color: $link-color; + text-decoration: none; + + @include hover-focus { + color: $link-hover-color; + text-decoration: $link-hover-decoration; + } + + &:focus { + @include tab-focus(); + } +} + + +// Images + +img { + vertical-align: middle; +} + + +// iOS "clickable elements" fix for role="button" +// +// Fixes "clickability" issue (and more generally, the firing of events such as focus as well) +// for traditionally non-focusable elements with role="button" +// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile +// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged + +[role="button"] { + cursor: pointer; +} diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss deleted file mode 100644 index 5217539a3..000000000 --- a/scss/_scaffolding.scss +++ /dev/null @@ -1,103 +0,0 @@ -// -// Scaffolding -// -------------------------------------------------- - - -// Reset the box-sizing -// -// 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: inherit; -} - - -// Make viewport responsive -// -// @viewport is supposed to eventually replace . It's manually prefixed for forward-compatibility. -// -// @viewport is also needed because IE 10+ doesn't honor in some cases. -// (See http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/) -// -// However, `device-width` is broken on IE 10 on Windows (Phone) 8, -// (see http://timkadlec.com/2013/01/windows-phone-8-and-device-width/ -// and https://github.com/twbs/bootstrap/issues/10497) -// and the fix for that involves a snippet of JavaScript to sniff the user agent and apply some conditional CSS. -// See http://getbootstrap.com/getting-started/#support-ie10-width for the relevant hack. - -@-moz-viewport { width: device-width; } -@-ms-viewport { width: device-width; } -@-o-viewport { width: device-width; } -@-webkit-viewport { width: device-width; } -@viewport { width: device-width; } - - -// Reset HTML, body, and more - -html { - font-size: $font-size-root; - -webkit-tap-highlight-color: rgba(0,0,0,0); -} - -body { - font-family: $font-family-base; - font-size: $font-size-base; - line-height: $line-height-base; - color: $text-color; - background-color: $body-bg; -} - -input, -button, -select, -textarea { - font-family: inherit; - font-size: inherit; - line-height: inherit; -} - - -// Links - -a { - color: $link-color; - text-decoration: none; - - @include hover-focus { - color: $link-hover-color; - text-decoration: $link-hover-decoration; - } - - &:focus { - @include tab-focus(); - } -} - - -// Images - -img { - vertical-align: middle; -} - - -// iOS "clickable elements" fix for role="button" -// -// Fixes "clickability" issue (and more generally, the firing of events such as focus as well) -// for traditionally non-focusable elements with role="button" -// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile -// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged - -[role="button"] { - cursor: pointer; -} diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 4cd94b97e..24c60d976 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -7,7 +7,7 @@ @import "print"; // Core CSS -@import "scaffolding"; +@import "reboot"; @import "type"; @import "images"; @import "code"; -- cgit v1.2.3