From 51375abca5769682f1d27de2e29e6e9f15ec7314 Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Thu, 7 Feb 2019 23:32:05 +0100 Subject: [PATCH] Responsive font size implementation (#23816) --- scss/_badge.scss | 2 +- scss/_close.scss | 2 +- scss/_code.scss | 10 +- scss/_custom-forms.scss | 6 +- scss/_dropdown.scss | 4 +- scss/_forms.scss | 12 +- scss/_images.scss | 2 +- scss/_input-group.scss | 6 +- scss/_mixins.scss | 3 + scss/_navbar.scss | 4 +- scss/_popover.scss | 4 +- scss/_progress.scss | 2 +- scss/_reboot.scss | 12 +- scss/_toasts.scss | 2 +- scss/_tooltip.scss | 2 +- scss/_type.scss | 30 +-- scss/_variables.scss | 18 +- scss/mixins/_buttons.scss | 2 +- scss/mixins/_forms.scss | 10 +- scss/mixins/_pagination.scss | 2 +- scss/vendor/_rfs.scss | 212 ++++++++++++++++++ site/docs/4.2/assets/scss/_ads.scss | 2 +- site/docs/4.2/assets/scss/_algolia.scss | 10 +- site/docs/4.2/assets/scss/_brand.scss | 2 +- site/docs/4.2/assets/scss/_clipboard-js.scss | 2 +- .../4.2/assets/scss/_component-examples.scss | 2 +- site/docs/4.2/assets/scss/_content.scss | 23 +- site/docs/4.2/assets/scss/_footer.scss | 2 +- site/docs/4.2/assets/scss/_masthead.scss | 6 +- site/docs/4.2/assets/scss/_nav.scss | 3 +- .../4.2/assets/scss/_placeholder-img.scss | 6 +- site/docs/4.2/assets/scss/_sidebar.scss | 4 +- site/docs/4.2/assets/scss/_variables.scss | 6 + site/docs/4.2/content/typography.md | 32 +-- site/docs/4.2/getting-started/theming.md | 1 + 35 files changed, 324 insertions(+), 124 deletions(-) create mode 100644 scss/vendor/_rfs.scss diff --git a/scss/_badge.scss b/scss/_badge.scss index c727ba5a2b..2082f058ec 100644 --- a/scss/_badge.scss +++ b/scss/_badge.scss @@ -6,7 +6,7 @@ .badge { display: inline-block; padding: $badge-padding-y $badge-padding-x; - font-size: $badge-font-size; + @include font-size($badge-font-size); font-weight: $badge-font-weight; line-height: 1; text-align: center; diff --git a/scss/_close.scss b/scss/_close.scss index ec6593a888..5cc96f573e 100644 --- a/scss/_close.scss +++ b/scss/_close.scss @@ -1,6 +1,6 @@ .close { float: right; - font-size: $close-font-size; + @include font-size($close-font-size); font-weight: $close-font-weight; line-height: 1; color: $close-color; diff --git a/scss/_code.scss b/scss/_code.scss index 9b2e027f40..74b6e1c89b 100644 --- a/scss/_code.scss +++ b/scss/_code.scss @@ -1,6 +1,6 @@ // Inline code code { - font-size: $code-font-size; + @include font-size($code-font-size); color: $code-color; word-break: break-word; @@ -13,7 +13,7 @@ code { // User input typically entered via keyboard kbd { padding: $kbd-padding-y $kbd-padding-x; - font-size: $kbd-font-size; + @include font-size($kbd-font-size); color: $kbd-color; background-color: $kbd-bg; @include border-radius($border-radius-sm); @@ -21,7 +21,7 @@ kbd { kbd { padding: 0; - font-size: 100%; + @include font-size(100%); font-weight: $nested-kbd-font-weight; @include box-shadow(none); } @@ -30,12 +30,12 @@ kbd { // Blocks of code pre { display: block; - font-size: $code-font-size; + @include font-size($code-font-size); color: $pre-color; // Account for some code outputs that place code tags in pre tags code { - font-size: inherit; + @include font-size(inherit); color: inherit; word-break: normal; } diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 8af59fd270..03f3fc5be2 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -215,7 +215,7 @@ height: $custom-select-height; padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x; font-family: $custom-select-font-family; - font-size: $custom-select-font-size; + @include font-size($custom-select-font-size); font-weight: $custom-select-font-weight; line-height: $custom-select-line-height; color: $custom-select-color; @@ -270,7 +270,7 @@ padding-top: $custom-select-padding-y-sm; padding-bottom: $custom-select-padding-y-sm; padding-left: $custom-select-padding-x-sm; - font-size: $custom-select-font-size-sm; + @include font-size($custom-select-font-size-sm); } .custom-select-lg { @@ -278,7 +278,7 @@ padding-top: $custom-select-padding-y-lg; padding-bottom: $custom-select-padding-y-lg; padding-left: $custom-select-padding-x-lg; - font-size: $custom-select-font-size-lg; + @include font-size($custom-select-font-size-lg); } diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 5e975c242b..ac3c8c8a2c 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -24,7 +24,7 @@ min-width: $dropdown-min-width; padding: $dropdown-padding-y 0; margin: $dropdown-spacer 0 0; // override default ul - font-size: $dropdown-font-size; + @include font-size($dropdown-font-size); color: $dropdown-color; text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) list-style: none; @@ -178,7 +178,7 @@ display: block; padding: $dropdown-padding-y $dropdown-item-padding-x; margin-bottom: 0; // for use with heading elements - font-size: $font-size-sm; + @include font-size($font-size-sm); color: $dropdown-header-color; white-space: nowrap; // as with > li > a } diff --git a/scss/_forms.scss b/scss/_forms.scss index 5f6269ff6a..ec9c335591 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -10,7 +10,7 @@ height: $input-height; padding: $input-padding-y $input-padding-x; font-family: $input-font-family; - font-size: $input-font-size; + @include font-size($input-font-size); font-weight: $input-font-weight; line-height: $input-line-height; color: $input-color; @@ -83,21 +83,21 @@ select.form-control { padding-top: calc(#{$input-padding-y} + #{$input-border-width}); padding-bottom: calc(#{$input-padding-y} + #{$input-border-width}); margin-bottom: 0; // Override the `