root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Remove -size-root so we can respect user prefs on browser default font-size

This commit is contained in:
Mark Otto 2017-01-03 13:50:25 -08:00 committed by Mark Otto
parent 2ea7e388e7
commit bd38a2a218
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scss/_popover.scss
View File

@ -134,8 +134,8 @@
font-size: $font-size-base; font-size: $font-size-base;
background-color: $popover-title-bg; background-color: $popover-title-bg;
border-bottom: $popover-border-width solid darken($popover-title-bg, 5%); border-bottom: $popover-border-width solid darken($popover-title-bg, 5%);
$offset-border-width: ($border-width / $font-size-root); $offset-border-width: calc(#{$border-radius-lg} - #{$popover-border-width});
@include border-radius(($border-radius-lg - $offset-border-width) ($border-radius-lg - $offset-border-width) 0 0); @include border-top-radius($offset-border-width);
&:empty { &:empty {
display: none; display: none;

8
scss/_reboot.scss
View File

@ -55,8 +55,10 @@ html {
// //
html { html {
// Sets a specific default `font-size` for user with `rem` type scales. // We assume no initial pixel `font-size` for accessibility reasons. This
font-size: $font-size-root; // allows web visitors to customize their browser default font-size, making
// your project more inclusive and accessible to everyone.
// As a side-effect of setting the @viewport above, // As a side-effect of setting the @viewport above,
// IE11 & Edge make the scrollbar overlap the content and automatically hide itself when not in use. // IE11 & Edge make the scrollbar overlap the content and automatically hide itself when not in use.
// Unfortunately, the auto-showing of the scrollbar is sometimes too sensitive, // Unfortunately, the auto-showing of the scrollbar is sometimes too sensitive,
@ -65,12 +67,12 @@ html {
// See https://github.com/twbs/bootstrap/issues/18543 // See https://github.com/twbs/bootstrap/issues/18543
// and https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/7165383/ // and https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/7165383/
-ms-overflow-style: scrollbar; -ms-overflow-style: scrollbar;
// Changes the default tap highlight to be completely transparent in iOS. // Changes the default tap highlight to be completely transparent in iOS.
-webkit-tap-highlight-color: rgba(0,0,0,0); -webkit-tap-highlight-color: rgba(0,0,0,0);
} }
body { body {
// Make the `body` use the `font-size-root`
font-family: $font-family-base; font-family: $font-family-base;
font-size: $font-size-base; font-size: $font-size-base;
font-weight: $font-weight-base; font-weight: $font-weight-base;

5
scss/_variables.scss
View File

@ -249,10 +249,7 @@ $font-family-serif: Georgia, "Times New Roman", Times, serif !default;
$font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
$font-family-base: $font-family-sans-serif !default; $font-family-base: $font-family-sans-serif !default;
// Pixel value used to responsively scale all typography. Applied to the `<html>` element. $font-size-base: 1rem !default; // Assumes the browser default, typically `16px`
$font-size-root: 16px !default;
$font-size-base: 1rem !default;
$font-size-lg: 1.25rem !default; $font-size-lg: 1.25rem !default;
$font-size-sm: .875rem !default; $font-size-sm: .875rem !default;
$font-size-xs: .75rem !default; $font-size-xs: .75rem !default;