diff options
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_modal.scss | 2 | ||||
| -rw-r--r-- | scss/_nav.scss | 2 | ||||
| -rw-r--r-- | scss/_utilities.scss | 2 | ||||
| -rw-r--r-- | scss/forms/_form-select.scss | 1 | ||||
| -rw-r--r-- | scss/mixins/_reset-text.scss | 2 |
5 files changed, 3 insertions, 6 deletions
diff --git a/scss/_modal.scss b/scss/_modal.scss index 21e1258f55..803b4d8117 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -124,8 +124,8 @@ // Footer (for actions) .modal-footer { display: flex; - flex-wrap: wrap; flex-shrink: 0; + flex-wrap: wrap; align-items: center; // vertically center justify-content: flex-end; // Right align buttons with flex property because text-align doesn't work on flex items padding: $modal-inner-padding - $modal-footer-margin-between * .5; diff --git a/scss/_nav.scss b/scss/_nav.scss index ffb27d869c..8660a4dbc9 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -49,9 +49,9 @@ &:hover, &:focus { - border-color: $nav-tabs-link-hover-border-color; // Prevents active .nav-link tab overlapping focus outline of previous/next .nav-link isolation: isolate; + border-color: $nav-tabs-link-hover-border-color; } &.disabled { diff --git a/scss/_utilities.scss b/scss/_utilities.scss index 960d6f1adf..6498349b20 100644 --- a/scss/_utilities.scss +++ b/scss/_utilities.scss @@ -1,5 +1,3 @@ -// stylelint-disable indentation - // Utilities $utilities: () !default; diff --git a/scss/forms/_form-select.scss b/scss/forms/_form-select.scss index 153ff6cd5c..78c34b8fd6 100644 --- a/scss/forms/_form-select.scss +++ b/scss/forms/_form-select.scss @@ -7,7 +7,6 @@ display: block; width: 100%; padding: $form-select-padding-y $form-select-indicator-padding $form-select-padding-y $form-select-padding-x; - // stylelint-disable-next-line property-no-vendor-prefix -moz-padding-start: subtract($form-select-padding-x, 3px); // See https://github.com/twbs/bootstrap/issues/32636 font-family: $form-select-font-family; @include font-size($form-select-font-size); diff --git a/scss/mixins/_reset-text.scss b/scss/mixins/_reset-text.scss index 354f5648b8..f5bd1afec2 100644 --- a/scss/mixins/_reset-text.scss +++ b/scss/mixins/_reset-text.scss @@ -11,7 +11,7 @@ text-transform: none; letter-spacing: normal; word-break: normal; - word-spacing: normal; white-space: normal; + word-spacing: normal; line-break: auto; } |