diff options
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_buttons.scss | 1 | ||||
| -rw-r--r-- | scss/_carousel.scss | 6 | ||||
| -rw-r--r-- | scss/_custom-forms.scss | 67 | ||||
| -rw-r--r-- | scss/_forms.scss | 28 | ||||
| -rw-r--r-- | scss/_functions.scss | 2 | ||||
| -rw-r--r-- | scss/_input-group.scss | 17 | ||||
| -rw-r--r-- | scss/_modal.scss | 28 | ||||
| -rw-r--r-- | scss/_navbar.scss | 4 | ||||
| -rw-r--r-- | scss/_reboot.scss | 6 | ||||
| -rw-r--r-- | scss/_tables.scss | 1 | ||||
| -rw-r--r-- | scss/_variables.scss | 32 | ||||
| -rw-r--r-- | scss/bootstrap-grid.scss | 3 | ||||
| -rw-r--r-- | scss/bootstrap-reboot.scss | 2 | ||||
| -rw-r--r-- | scss/bootstrap.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_breakpoints.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_forms.scss | 14 | ||||
| -rw-r--r-- | scss/mixins/_hover.scss | 2 | ||||
| -rw-r--r-- | scss/utilities/_spacing.scss | 24 | ||||
| -rw-r--r-- | scss/utilities/_text.scss | 12 |
19 files changed, 169 insertions, 84 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 70a55f3409..0a8eaa9b64 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -40,7 +40,6 @@ &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled).active { - background-image: none; @include box-shadow($btn-active-box-shadow); &:focus { diff --git a/scss/_carousel.scss b/scss/_carousel.scss index 91c23e5fc3..b7114e9637 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -190,7 +190,9 @@ margin-left: $carousel-indicator-spacer; text-indent: -999px; cursor: pointer; - background-color: rgba($carousel-indicator-active-bg, .5); + background-color: $carousel-indicator-active-bg; + opacity: .5; + @include transition($carousel-indicator-transition); // Use pseudo classes to increase the hit area by 10px on top and bottom. &::before { @@ -214,7 +216,7 @@ } .active { - background-color: $carousel-indicator-active-bg; + opacity: 1; } } diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index b021b908c0..50b72cb942 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -10,7 +10,7 @@ .custom-control { position: relative; display: block; - min-height: (1rem * $line-height-base); + min-height: ($font-size-base * $line-height-base); padding-left: $custom-control-gutter; } @@ -63,7 +63,7 @@ // Background-color and (when enabled) gradient &::before { position: absolute; - top: (($line-height-base - $custom-control-indicator-size) / 2); + top: (($font-size-base * $line-height-base - $custom-control-indicator-size) / 2); left: -$custom-control-gutter; display: block; width: $custom-control-indicator-size; @@ -78,7 +78,7 @@ // Foreground (icon) &::after { position: absolute; - top: (($line-height-base - $custom-control-indicator-size) / 2); + top: (($font-size-base * $line-height-base - $custom-control-indicator-size) / 2); left: -$custom-control-gutter; display: block; width: $custom-control-indicator-size; @@ -220,15 +220,17 @@ .custom-select-sm { height: $custom-select-height-sm; - padding-top: $custom-select-padding-y; - padding-bottom: $custom-select-padding-y; + 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; } .custom-select-lg { height: $custom-select-height-lg; - padding-top: $custom-select-padding-y; - padding-bottom: $custom-select-padding-y; + 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; } @@ -314,12 +316,19 @@ .custom-range { width: 100%; - padding-left: 0; // Firefox specific + height: calc(#{$custom-range-thumb-height} + #{$custom-range-thumb-focus-box-shadow-width * 2}); + padding: 0; // Need to reset padding background-color: transparent; appearance: none; &:focus { outline: none; + + // Pseudo-elements must be split across multiple rulesets to have an affect. + // No box-shadow() mixin for focus accessibility. + &::-webkit-slider-thumb { box-shadow: $custom-range-thumb-focus-box-shadow; } + &::-moz-range-thumb { box-shadow: $custom-range-thumb-focus-box-shadow; } + &::-ms-thumb { box-shadow: $custom-range-thumb-focus-box-shadow; } } &::-moz-focus-outer { @@ -329,7 +338,7 @@ &::-webkit-slider-thumb { width: $custom-range-thumb-width; height: $custom-range-thumb-height; - margin-top: -($custom-range-thumb-width * .25); // Webkit specific? + margin-top: (($custom-range-track-height - $custom-range-thumb-height) / 2); // Webkit specific @include gradient-bg($custom-range-thumb-bg); border: $custom-range-thumb-border; @include border-radius($custom-range-thumb-border-radius); @@ -337,11 +346,6 @@ @include transition($custom-forms-transition); appearance: none; - &:focus { - outline: none; - box-shadow: $custom-range-thumb-focus-box-shadow; // No mixin for focus accessibility - } - &:active { @include gradient-bg($custom-range-thumb-active-bg); } @@ -368,11 +372,6 @@ @include transition($custom-forms-transition); appearance: none; - &:focus { - outline: none; - box-shadow: $custom-range-thumb-focus-box-shadow; // No mixin for focus accessibility - } - &:active { @include gradient-bg($custom-range-thumb-active-bg); } @@ -392,6 +391,9 @@ &::-ms-thumb { width: $custom-range-thumb-width; height: $custom-range-thumb-height; + margin-top: 0; // Edge specific + margin-right: $custom-range-thumb-focus-box-shadow-width; // Workaround that overflowed box-shadow is hidden. + margin-left: $custom-range-thumb-focus-box-shadow-width; // Workaround that overflowed box-shadow is hidden. @include gradient-bg($custom-range-thumb-bg); border: $custom-range-thumb-border; @include border-radius($custom-range-thumb-border-radius); @@ -399,11 +401,6 @@ @include transition($custom-forms-transition); appearance: none; - &:focus { - outline: none; - box-shadow: $custom-range-thumb-focus-box-shadow; // No mixin for focus accessibility - } - &:active { @include gradient-bg($custom-range-thumb-active-bg); } @@ -430,6 +427,28 @@ background-color: $custom-range-track-bg; @include border-radius($custom-range-track-border-radius); } + + &:disabled { + &::-webkit-slider-thumb { + background-color: $custom-range-thumb-disabled-bg; + } + + &::-webkit-slider-runnable-track { + cursor: default; + } + + &::-moz-range-thumb { + background-color: $custom-range-thumb-disabled-bg; + } + + &::-moz-range-track { + cursor: default; + } + + &::-ms-thumb { + background-color: $custom-range-thumb-disabled-bg; + } + } } .custom-control-label::before, diff --git a/scss/_forms.scss b/scss/_forms.scss index c079bd5c4f..5530630ed6 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -7,6 +7,7 @@ .form-control { display: block; width: 100%; + height: $input-height; padding: $input-padding-y $input-padding-x; font-size: $font-size-base; line-height: $input-line-height; @@ -57,10 +58,6 @@ } select.form-control { - &:not([size]):not([multiple]) { - height: $input-height; - } - &:focus::-ms-value { // Suppress the nested default white text on blue background highlight given to // the selected option text when the (still closed) <select> receives focus @@ -139,35 +136,36 @@ select.form-control { // Build on `.form-control` with modifier classes to decrease or increase the // height and font-size of form controls. // -// The `.form-group-* form-control` variations are sadly duplicated to avoid the -// issue documented in https://github.com/twbs/bootstrap/issues/15074. +// Repeated in `_input_group.scss` to avoid Sass extend issues. .form-control-sm { + height: $input-height-sm; padding: $input-padding-y-sm $input-padding-x-sm; font-size: $font-size-sm; line-height: $input-line-height-sm; @include border-radius($input-border-radius-sm); } -select.form-control-sm { - &:not([size]):not([multiple]) { - height: $input-height-sm; - } -} - .form-control-lg { + height: $input-height-lg; padding: $input-padding-y-lg $input-padding-x-lg; font-size: $font-size-lg; line-height: $input-line-height-lg; @include border-radius($input-border-radius-lg); } -select.form-control-lg { - &:not([size]):not([multiple]) { - height: $input-height-lg; +// stylelint-disable no-duplicate-selectors +select.form-control { + &[size], + &[multiple] { + height: auto; } } +textarea.form-control { + height: auto; +} +// stylelint-enable no-duplicate-selectors // Form groups // diff --git a/scss/_functions.scss b/scss/_functions.scss index b44d7d9986..bf8be9aee9 100644 --- a/scss/_functions.scss +++ b/scss/_functions.scss @@ -1,6 +1,6 @@ // Bootstrap functions // -// Utility mixins and functions for evalutating source code across our variables, maps, and mixins. +// Utility mixins and functions for evaluating source code across our variables, maps, and mixins. // Ascending // Used to evaluate Sass maps like our grid breakpoints. diff --git a/scss/_input-group.scss b/scss/_input-group.scss index a8b0e59ed4..2ed5f33040 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -35,6 +35,11 @@ z-index: 3; } + // Bring the custom file input above the label + > .custom-file .custom-file-input:focus { + z-index: 4; + } + > .form-control, > .custom-select { &:not(:last-child) { @include border-right-radius(0); } @@ -122,7 +127,11 @@ .input-group-lg > .input-group-append > .input-group-text, .input-group-lg > .input-group-prepend > .btn, .input-group-lg > .input-group-append > .btn { - @extend .form-control-lg; + height: $input-height-lg; + padding: $input-padding-y-lg $input-padding-x-lg; + font-size: $font-size-lg; + line-height: $input-line-height-lg; + @include border-radius($input-border-radius-lg); } .input-group-sm > .form-control, @@ -130,7 +139,11 @@ .input-group-sm > .input-group-append > .input-group-text, .input-group-sm > .input-group-prepend > .btn, .input-group-sm > .input-group-append > .btn { - @extend .form-control-sm; + height: $input-height-sm; + padding: $input-padding-y-sm $input-padding-x-sm; + font-size: $font-size-sm; + line-height: $input-line-height-sm; + @include border-radius($input-border-radius-sm); } diff --git a/scss/_modal.scss b/scss/_modal.scss index fea8112371..5eadbf5b84 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -4,9 +4,14 @@ // .modal-content - actual modal w/ bg and corners and stuff -// Kill the scroll on the body .modal-open { + // Kill the scroll on the body overflow: hidden; + + .modal { + overflow-x: hidden; + overflow-y: auto; + } } // Container that the modal scrolls within @@ -25,11 +30,6 @@ // We deliberately don't use `-webkit-overflow-scrolling: touch;` due to a // gnarly iOS Safari bug: https://bugs.webkit.org/show_bug.cgi?id=158342 // See also https://github.com/twbs/bootstrap/issues/17695 - - .modal-open & { - overflow-x: hidden; - overflow-y: auto; - } } // Shell div to position the modal with bottom padding @@ -54,6 +54,13 @@ display: flex; align-items: center; min-height: calc(100% - (#{$modal-dialog-margin} * 2)); + + // Ensure `modal-dialog-centered` extends the full height of the view (IE10/11) + &::before { + display: block; // IE10 + height: calc(100vh - (#{$modal-dialog-margin} * 2)); + content: ""; + } } // Actual modal @@ -153,6 +160,11 @@ .modal-dialog-centered { min-height: calc(100% - (#{$modal-dialog-margin-y-sm-up} * 2)); + + &::before { + height: calc(100vh - (#{$modal-dialog-margin-y-sm-up} * 2)); + } + } .modal-content { @@ -166,3 +178,7 @@ @include media-breakpoint-up(lg) { .modal-lg { max-width: $modal-lg; } } + +@include media-breakpoint-up(xl) { + .modal-xl { max-width: $modal-xl; } +} diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 05025273f8..52de5050a4 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -24,7 +24,7 @@ padding: $navbar-padding-y $navbar-padding-x; // Because flex properties aren't inherited, we need to redeclare these first - // few properities so that content nested within behave properly. + // few properties so that content nested within behave properly. > .container, > .container-fluid { display: flex; @@ -94,7 +94,7 @@ // Powered by the collapse Bootstrap JavaScript plugin. // When collapsed, prevent the toggleable navbar contents from appearing in -// the default flexbox row orienation. Requires the use of `flex-wrap: wrap` +// the default flexbox row orientation. Requires the use of `flex-wrap: wrap` // on the `.navbar` parent. .navbar-collapse { flex-basis: 100%; diff --git a/scss/_reboot.scss b/scss/_reboot.scss index d7bab8d6f4..f297d095c4 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -272,8 +272,10 @@ img { border-style: none; // Remove the border on images inside links in IE 10-. } -svg:not(:root) { - overflow: hidden; // Hide the overflow in IE +svg { + // Workaround for the SVG overflow bug in IE10/11 is still required. + // See https://github.com/twbs/bootstrap/issues/26878 + overflow: hidden; vertical-align: middle; } diff --git a/scss/_tables.scss b/scss/_tables.scss index b32732f23a..5fa6a86629 100644 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@ -4,7 +4,6 @@ .table { width: 100%; - max-width: 100%; margin-bottom: $spacer; background-color: $table-bg; // Reset for nesting within parents with `background-color`. diff --git a/scss/_variables.scss b/scss/_variables.scss index 9d6565d992..8ac3bc583a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -248,7 +248,7 @@ $transition-collapse: height .35s ease !default; // Font, line-height, and color for body text, headings, and more. // stylelint-disable value-keyword-case -$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; +$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; // stylelint-enable value-keyword-case @@ -257,9 +257,11 @@ $font-size-base: 1rem !default; // Assumes the browser default, typ $font-size-lg: ($font-size-base * 1.25) !default; $font-size-sm: ($font-size-base * .875) !default; +$font-weight-lighter: lighter !default; $font-weight-light: 300 !default; $font-weight-normal: 400 !default; $font-weight-bold: 700 !default; +$font-weight-bolder: bolder !default; $font-weight-base: $font-weight-normal !default; $line-height-base: 1.5 !default; @@ -526,10 +528,14 @@ $custom-select-focus-border-color: $input-focus-border-color !default; $custom-select-focus-width: $input-btn-focus-width !default; $custom-select-focus-box-shadow: 0 0 0 $custom-select-focus-width rgba($custom-select-focus-border-color, .5) !default; -$custom-select-font-size-sm: 75% !default; +$custom-select-padding-y-sm: $input-btn-padding-y-sm !default; +$custom-select-padding-x-sm: $input-btn-padding-x-sm !default; +$custom-select-font-size-sm: $font-size-sm !default; $custom-select-height-sm: $input-height-sm !default; -$custom-select-font-size-lg: 125% !default; +$custom-select-padding-y-lg: $input-btn-padding-y-lg !default; +$custom-select-padding-x-lg: $input-btn-padding-x-lg !default; +$custom-select-font-size-lg: $font-size-lg !default; $custom-select-height-lg: $input-height-lg !default; $custom-range-track-width: 100% !default; @@ -539,14 +545,16 @@ $custom-range-track-bg: $gray-300 !default; $custom-range-track-border-radius: 1rem !default; $custom-range-track-box-shadow: inset 0 .25rem .25rem rgba($black, .1) !default; -$custom-range-thumb-width: 1rem !default; -$custom-range-thumb-height: $custom-range-thumb-width !default; -$custom-range-thumb-bg: $component-active-bg !default; -$custom-range-thumb-border: 0 !default; -$custom-range-thumb-border-radius: 1rem !default; -$custom-range-thumb-box-shadow: 0 .1rem .25rem rgba($black, .1) !default; -$custom-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-btn-focus-box-shadow !default; -$custom-range-thumb-active-bg: lighten($component-active-bg, 35%) !default; +$custom-range-thumb-width: 1rem !default; +$custom-range-thumb-height: $custom-range-thumb-width !default; +$custom-range-thumb-bg: $component-active-bg !default; +$custom-range-thumb-border: 0 !default; +$custom-range-thumb-border-radius: 1rem !default; +$custom-range-thumb-box-shadow: 0 .1rem .25rem rgba($black, .1) !default; +$custom-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-btn-focus-box-shadow !default; +$custom-range-thumb-focus-box-shadow-width: $input-btn-focus-width !default; // For focus box shadow issue in IE/Edge +$custom-range-thumb-active-bg: lighten($component-active-bg, 35%) !default; +$custom-range-thumb-disabled-bg: $gray-500 !default; $custom-file-height: $input-height !default; $custom-file-height-inner: $input-height-inner !default; @@ -818,6 +826,7 @@ $modal-header-border-width: $modal-content-border-width !default; $modal-footer-border-width: $modal-header-border-width !default; $modal-header-padding: 1rem !default; +$modal-xl: 1140px !default; $modal-lg: 800px !default; $modal-md: 500px !default; $modal-sm: 300px !default; @@ -920,6 +929,7 @@ $carousel-indicator-width: 30px !default; $carousel-indicator-height: 3px !default; $carousel-indicator-spacer: 3px !default; $carousel-indicator-active-bg: $white !default; +$carousel-indicator-transition: opacity .6s ease !default; $carousel-caption-width: 70% !default; $carousel-caption-color: $white !default; diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss index d48d4a5f8a..16f5f0dfb9 100644 --- a/scss/bootstrap-grid.scss +++ b/scss/bootstrap-grid.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Grid v4.1.1 (https://getbootstrap.com/) + * Bootstrap Grid v4.1.3 (https://getbootstrap.com/) * Copyright 2011-2018 The Bootstrap Authors * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) @@ -30,3 +30,4 @@ html { @import "grid"; @import "utilities/display"; @import "utilities/flex"; +@import "utilities/spacing"; diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss index 615e447462..75baeb713e 100644 --- a/scss/bootstrap-reboot.scss +++ b/scss/bootstrap-reboot.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Reboot v4.1.1 (https://getbootstrap.com/) + * Bootstrap Reboot v4.1.3 (https://getbootstrap.com/) * Copyright 2011-2018 The Bootstrap Authors * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 5732a8d820..e3f76546b2 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v4.1.1 (https://getbootstrap.com/) + * Bootstrap v4.1.3 (https://getbootstrap.com/) * Copyright 2011-2018 The Bootstrap Authors * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/scss/mixins/_breakpoints.scss b/scss/mixins/_breakpoints.scss index d1ad684cc7..59f25a27e6 100644 --- a/scss/mixins/_breakpoints.scss +++ b/scss/mixins/_breakpoints.scss @@ -42,7 +42,7 @@ @return if($next, breakpoint-min($next, $breakpoints) - .02px, null); } -// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront. +// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash in front. // Useful for making responsive utilities. // // >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index a90db20231..2b89390acc 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -41,13 +41,13 @@ z-index: 5; display: none; max-width: 100%; // Contain to parent when possible - padding: .5rem; + padding: $tooltip-padding-y $tooltip-padding-x; margin-top: .1rem; - font-size: .875rem; - line-height: 1; - color: $white; - background-color: rgba($color, .8); - border-radius: .2rem; + font-size: $tooltip-font-size; + line-height: $line-height-base; + color: color-yiq($color); + background-color: rgba($color, $tooltip-opacity); + @include border-radius($tooltip-border-radius); } .form-control { @@ -181,7 +181,7 @@ ~ .custom-file-label { border-color: $color; - &::before { border-color: inherit; } + &::after { border-color: inherit; } } ~ .#{$state}-feedback, diff --git a/scss/mixins/_hover.scss b/scss/mixins/_hover.scss index c1224ffc53..192f847e17 100644 --- a/scss/mixins/_hover.scss +++ b/scss/mixins/_hover.scss @@ -1,6 +1,6 @@ // Hover mixin and `$enable-hover-media-query` are deprecated. // -// Origally added during our alphas and maintained during betas, this mixin was +// Originally added during our alphas and maintained during betas, this mixin was // designed to prevent `:hover` stickiness on iOS-an issue where hover styles // would persist after initial touch. // diff --git a/scss/utilities/_spacing.scss b/scss/utilities/_spacing.scss index b2e2354b12..c43387dec1 100644 --- a/scss/utilities/_spacing.scss +++ b/scss/utilities/_spacing.scss @@ -8,7 +8,6 @@ @each $prop, $abbrev in (margin: m, padding: p) { @each $size, $length in $spacers { - .#{$abbrev}#{$infix}-#{$size} { #{$prop}: $length !important; } .#{$abbrev}t#{$infix}-#{$size}, .#{$abbrev}y#{$infix}-#{$size} { @@ -29,6 +28,29 @@ } } + // Negative margins (e.g., where `.mb-n1` is negative version of `.mb-1`) + @each $size, $length in $spacers { + @if not $size == 0 { + .m#{$infix}-n#{$size} { margin: -$length !important; } + .mt#{$infix}-n#{$size}, + .my#{$infix}-n#{$size} { + margin-top: -$length !important; + } + .mr#{$infix}-n#{$size}, + .mx#{$infix}-n#{$size} { + margin-right: -$length !important; + } + .mb#{$infix}-n#{$size}, + .my#{$infix}-n#{$size} { + margin-bottom: -$length !important; + } + .ml#{$infix}-n#{$size}, + .mx#{$infix}-n#{$size} { + margin-left: -$length !important; + } + } + } + // Some special margin utils .m#{$infix}-auto { margin: auto !important; } .mt#{$infix}-auto, diff --git a/scss/utilities/_text.scss b/scss/utilities/_text.scss index 9d96c46562..d7e6efeda8 100644 --- a/scss/utilities/_text.scss +++ b/scss/utilities/_text.scss @@ -32,10 +32,12 @@ // Weight and italics -.font-weight-light { font-weight: $font-weight-light !important; } -.font-weight-normal { font-weight: $font-weight-normal !important; } -.font-weight-bold { font-weight: $font-weight-bold !important; } -.font-italic { font-style: italic !important; } +.font-weight-light { font-weight: $font-weight-light !important; } +.font-weight-lighter { font-weight: $font-weight-lighter !important; } +.font-weight-normal { font-weight: $font-weight-normal !important; } +.font-weight-bold { font-weight: $font-weight-bold !important; } +.font-weight-bolder { font-weight: $font-weight-bolder !important; } +.font-italic { font-style: italic !important; } // Contextual colors @@ -56,3 +58,5 @@ .text-hide { @include text-hide($ignore-warning: true); } + +.text-decoration-none { text-decoration: none !important; } |