From 1111aa9bf286072db3cee3f40bca4a841befd060 Mon Sep 17 00:00:00 2001 From: Graham Dixon Date: Fri, 5 Feb 2021 15:32:06 +0000 Subject: [PATCH] Updates bootstrap v4.3.1 -> v4.6.0 --- app/assets/v3/scss/lib/bootstrap/_alert.scss | 1 + app/assets/v3/scss/lib/bootstrap/_badge.scss | 2 +- .../v3/scss/lib/bootstrap/_breadcrumb.scss | 5 +- .../v3/scss/lib/bootstrap/_button-group.scss | 2 +- .../v3/scss/lib/bootstrap/_buttons.scss | 21 +++-- app/assets/v3/scss/lib/bootstrap/_card.scss | 87 +++++++++-------- .../v3/scss/lib/bootstrap/_carousel.scss | 14 +-- app/assets/v3/scss/lib/bootstrap/_close.scss | 5 +- app/assets/v3/scss/lib/bootstrap/_code.scss | 2 +- .../v3/scss/lib/bootstrap/_custom-forms.scss | 57 ++++++++---- .../v3/scss/lib/bootstrap/_dropdown.scss | 13 +-- app/assets/v3/scss/lib/bootstrap/_forms.scss | 35 +++++-- .../v3/scss/lib/bootstrap/_functions.scss | 68 +++++++++++++- app/assets/v3/scss/lib/bootstrap/_grid.scss | 43 ++++++--- app/assets/v3/scss/lib/bootstrap/_images.scss | 4 +- .../v3/scss/lib/bootstrap/_input-group.scss | 27 ++++-- .../v3/scss/lib/bootstrap/_list-group.scss | 67 ++++++------- app/assets/v3/scss/lib/bootstrap/_mixins.scss | 6 +- app/assets/v3/scss/lib/bootstrap/_modal.scss | 41 +++++--- app/assets/v3/scss/lib/bootstrap/_nav.scss | 14 +-- app/assets/v3/scss/lib/bootstrap/_navbar.scss | 72 ++++++++++---- .../v3/scss/lib/bootstrap/_pagination.scss | 9 +- .../v3/scss/lib/bootstrap/_popover.scss | 17 ++-- app/assets/v3/scss/lib/bootstrap/_print.scss | 4 +- .../v3/scss/lib/bootstrap/_progress.scss | 10 +- app/assets/v3/scss/lib/bootstrap/_reboot.scss | 77 +++++++-------- .../v3/scss/lib/bootstrap/_spinners.scss | 18 +++- app/assets/v3/scss/lib/bootstrap/_tables.scss | 6 +- app/assets/v3/scss/lib/bootstrap/_toasts.scss | 6 +- app/assets/v3/scss/lib/bootstrap/_type.scss | 6 +- .../v3/scss/lib/bootstrap/_utilities.scss | 3 +- .../v3/scss/lib/bootstrap/_variables.scss | 93 ++++++++++++------- .../v3/scss/lib/bootstrap/bootstrap-grid.scss | 9 +- .../scss/lib/bootstrap/bootstrap-reboot.scss | 8 +- .../v3/scss/lib/bootstrap/bootstrap.scss | 8 +- .../bootstrap/mixins/_background-variant.scss | 8 +- .../v3/scss/lib/bootstrap/mixins/_badge.scss | 2 +- .../lib/bootstrap/mixins/_border-radius.scss | 41 +++++--- .../scss/lib/bootstrap/mixins/_buttons.scss | 19 ++-- .../v3/scss/lib/bootstrap/mixins/_caret.scss | 16 ++-- .../v3/scss/lib/bootstrap/mixins/_float.scss | 6 +- .../v3/scss/lib/bootstrap/mixins/_forms.scss | 91 +++++++++--------- .../lib/bootstrap/mixins/_grid-framework.scss | 44 ++++++--- .../v3/scss/lib/bootstrap/mixins/_grid.scss | 32 +++++-- .../v3/scss/lib/bootstrap/mixins/_hover.scss | 8 +- .../v3/scss/lib/bootstrap/mixins/_image.scss | 4 +- .../lib/bootstrap/mixins/_list-group.scss | 2 +- .../v3/scss/lib/bootstrap/mixins/_lists.scss | 2 +- .../lib/bootstrap/mixins/_nav-divider.scss | 3 +- .../lib/bootstrap/mixins/_reset-text.scss | 2 +- .../lib/bootstrap/mixins/_screen-reader.scss | 7 +- .../scss/lib/bootstrap/mixins/_table-row.scss | 2 +- .../lib/bootstrap/mixins/_text-emphasis.scss | 5 +- .../lib/bootstrap/mixins/_transition.scss | 26 ++++-- .../lib/bootstrap/utilities/_background.scss | 4 +- .../lib/bootstrap/utilities/_borders.scss | 2 +- .../bootstrap/utilities/_interactions.scss | 5 + .../scss/lib/bootstrap/utilities/_text.scss | 8 +- 58 files changed, 745 insertions(+), 454 deletions(-) create mode 100644 app/assets/v3/scss/lib/bootstrap/utilities/_interactions.scss diff --git a/app/assets/v3/scss/lib/bootstrap/_alert.scss b/app/assets/v3/scss/lib/bootstrap/_alert.scss index da2a98af94e..4aa1fc20397 100644 --- a/app/assets/v3/scss/lib/bootstrap/_alert.scss +++ b/app/assets/v3/scss/lib/bootstrap/_alert.scss @@ -34,6 +34,7 @@ position: absolute; top: 0; right: 0; + z-index: 2; padding: $alert-padding-y $alert-padding-x; color: inherit; } diff --git a/app/assets/v3/scss/lib/bootstrap/_badge.scss b/app/assets/v3/scss/lib/bootstrap/_badge.scss index 2082f058ece..42c5d08d748 100644 --- a/app/assets/v3/scss/lib/bootstrap/_badge.scss +++ b/app/assets/v3/scss/lib/bootstrap/_badge.scss @@ -16,7 +16,7 @@ @include transition($badge-transition); @at-root a#{&} { - @include hover-focus { + @include hover-focus() { text-decoration: none; } } diff --git a/app/assets/v3/scss/lib/bootstrap/_breadcrumb.scss b/app/assets/v3/scss/lib/bootstrap/_breadcrumb.scss index be309506903..9c204c7d553 100644 --- a/app/assets/v3/scss/lib/bootstrap/_breadcrumb.scss +++ b/app/assets/v3/scss/lib/bootstrap/_breadcrumb.scss @@ -3,6 +3,7 @@ flex-wrap: wrap; padding: $breadcrumb-padding-y $breadcrumb-padding-x; margin-bottom: $breadcrumb-margin-bottom; + @include font-size($breadcrumb-font-size); list-style: none; background-color: $breadcrumb-bg; @include border-radius($breadcrumb-border-radius); @@ -14,10 +15,10 @@ padding-left: $breadcrumb-item-padding; &::before { - display: inline-block; // Suppress underlining of the separator in modern browsers + float: left; // Suppress inline spacings and underlining of the separator padding-right: $breadcrumb-item-padding; color: $breadcrumb-divider-color; - content: $breadcrumb-divider; + content: escape-svg($breadcrumb-divider); } } diff --git a/app/assets/v3/scss/lib/bootstrap/_button-group.scss b/app/assets/v3/scss/lib/bootstrap/_button-group.scss index d7220029ad1..da02d7931b6 100644 --- a/app/assets/v3/scss/lib/bootstrap/_button-group.scss +++ b/app/assets/v3/scss/lib/bootstrap/_button-group.scss @@ -13,7 +13,7 @@ // Bring the hover, focused, and "active" buttons to the front to overlay // the borders properly - @include hover { + @include hover() { z-index: 1; } &:focus, diff --git a/app/assets/v3/scss/lib/bootstrap/_buttons.scss b/app/assets/v3/scss/lib/bootstrap/_buttons.scss index 2a7d94ad228..6ee24ba1fcf 100644 --- a/app/assets/v3/scss/lib/bootstrap/_buttons.scss +++ b/app/assets/v3/scss/lib/bootstrap/_buttons.scss @@ -10,6 +10,8 @@ font-weight: $btn-font-weight; color: $body-color; text-align: center; + text-decoration: if($link-decoration == none, null, none); + white-space: $btn-white-space; vertical-align: middle; user-select: none; background-color: transparent; @@ -17,7 +19,7 @@ @include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-line-height, $btn-border-radius); @include transition($btn-transition); - @include hover { + @include hover() { color: $body-color; text-decoration: none; } @@ -35,12 +37,16 @@ @include box-shadow(none); } - &:not(:disabled):not(.disabled):active, - &:not(:disabled):not(.disabled).active { - @include box-shadow($btn-active-box-shadow); + &:not(:disabled):not(.disabled) { + cursor: if($enable-pointer-cursor-for-buttons, pointer, null); - &:focus { - @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); + &:active, + &.active { + @include box-shadow($btn-active-box-shadow); + + &:focus { + @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); + } } } } @@ -79,7 +85,7 @@ fieldset:disabled a.btn { color: $link-color; text-decoration: $link-decoration; - @include hover { + @include hover() { color: $link-hover-color; text-decoration: $link-hover-decoration; } @@ -87,7 +93,6 @@ fieldset:disabled a.btn { &:focus, &.focus { text-decoration: $link-hover-decoration; - box-shadow: none; } &:disabled, diff --git a/app/assets/v3/scss/lib/bootstrap/_card.scss b/app/assets/v3/scss/lib/bootstrap/_card.scss index c6b67ce05d5..faaa75ef7fc 100644 --- a/app/assets/v3/scss/lib/bootstrap/_card.scss +++ b/app/assets/v3/scss/lib/bootstrap/_card.scss @@ -7,6 +7,7 @@ display: flex; flex-direction: column; min-width: 0; // See https://github.com/twbs/bootstrap/pull/22740#issuecomment-305868106 + height: $card-height; word-wrap: break-word; background-color: $card-bg; background-clip: border-box; @@ -18,23 +19,36 @@ margin-left: 0; } - > .list-group:first-child { - .list-group-item:first-child { - @include border-top-radius($card-border-radius); + > .list-group { + border-top: inherit; + border-bottom: inherit; + + &:first-child { + border-top-width: 0; + @include border-top-radius($card-inner-border-radius); } - } - > .list-group:last-child { - .list-group-item:last-child { - @include border-bottom-radius($card-border-radius); + &:last-child { + border-bottom-width: 0; + @include border-bottom-radius($card-inner-border-radius); } } + + // Due to specificity of the above selector (`.card > .list-group`), we must + // use a child selector here to prevent double borders. + > .card-header + .list-group, + > .list-group + .card-footer { + border-top: 0; + } } .card-body { // Enable `flex-grow: 1` for decks and groups so that card blocks take up // as much space as possible, ensuring footers are aligned to the bottom. flex: 1 1 auto; + // Workaround for the image size bug in IE + // See: https://github.com/twbs/bootstrap/pull/28855 + min-height: 1px; padding: $card-spacer-x; color: $card-color; } @@ -53,7 +67,7 @@ } .card-link { - @include hover { + @include hover() { text-decoration: none; } @@ -76,16 +90,11 @@ &:first-child { @include border-radius($card-inner-border-radius $card-inner-border-radius 0 0); } - - + .list-group { - .list-group-item:first-child { - border-top: 0; - } - } } .card-footer { padding: $card-spacer-y $card-spacer-x; + color: $card-cap-color; background-color: $card-cap-bg; border-top: $card-border-width solid $card-border-color; @@ -119,21 +128,23 @@ bottom: 0; left: 0; padding: $card-img-overlay-padding; + @include border-radius($card-inner-border-radius); } -.card-img { +.card-img, +.card-img-top, +.card-img-bottom { + flex-shrink: 0; // For IE: https://github.com/twbs/bootstrap/issues/29396 width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch - @include border-radius($card-inner-border-radius); } -// Card image caps +.card-img, .card-img-top { - width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch @include border-top-radius($card-inner-border-radius); } +.card-img, .card-img-bottom { - width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch @include border-bottom-radius($card-inner-border-radius); } @@ -141,23 +152,19 @@ // Card deck .card-deck { - display: flex; - flex-direction: column; - .card { margin-bottom: $card-deck-margin; } @include media-breakpoint-up(sm) { + display: flex; flex-flow: row wrap; margin-right: -$card-deck-margin; margin-left: -$card-deck-margin; .card { - display: flex; // Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4 flex: 1 0 0%; - flex-direction: column; margin-right: $card-deck-margin; margin-bottom: 0; // Override the default margin-left: $card-deck-margin; @@ -171,9 +178,6 @@ // .card-group { - display: flex; - flex-direction: column; - // The child selector allows nested `.card` within `.card-group` // to display properly. > .card { @@ -181,6 +185,7 @@ } @include media-breakpoint-up(sm) { + display: flex; flex-flow: row wrap; // The child selector allows nested `.card` within `.card-group` // to display properly. @@ -201,12 +206,12 @@ .card-img-top, .card-header { - // stylelint-disable-next-line property-blacklist + // stylelint-disable-next-line property-disallowed-list border-top-right-radius: 0; } .card-img-bottom, .card-footer { - // stylelint-disable-next-line property-blacklist + // stylelint-disable-next-line property-disallowed-list border-bottom-right-radius: 0; } } @@ -216,12 +221,12 @@ .card-img-top, .card-header { - // stylelint-disable-next-line property-blacklist + // stylelint-disable-next-line property-disallowed-list border-top-left-radius: 0; } .card-img-bottom, .card-footer { - // stylelint-disable-next-line property-blacklist + // stylelint-disable-next-line property-disallowed-list border-bottom-left-radius: 0; } } @@ -259,30 +264,22 @@ // .accordion { + overflow-anchor: none; + > .card { overflow: hidden; - &:not(:first-of-type) { - .card-header:first-child { - @include border-radius(0); - } - - &:not(:last-of-type) { - border-bottom: 0; - @include border-radius(0); - } - } - - &:first-of-type { + &:not(:last-of-type) { border-bottom: 0; @include border-bottom-radius(0); } - &:last-of-type { + &:not(:first-of-type) { @include border-top-radius(0); } - .card-header { + > .card-header { + @include border-radius(0); margin-bottom: -$card-border-width; } } diff --git a/app/assets/v3/scss/lib/bootstrap/_carousel.scss b/app/assets/v3/scss/lib/bootstrap/_carousel.scss index 20ea04baf4e..db30bed8b9e 100644 --- a/app/assets/v3/scss/lib/bootstrap/_carousel.scss +++ b/app/assets/v3/scss/lib/bootstrap/_carousel.scss @@ -75,7 +75,7 @@ .active.carousel-item-right { z-index: 0; opacity: 0; - @include transition(0s $carousel-transition-duration opacity); + @include transition(opacity 0s $carousel-transition-duration); } } @@ -101,7 +101,7 @@ @include transition($carousel-control-transition); // Hover/focus state - @include hover-focus { + @include hover-focus() { color: $carousel-control-color; text-decoration: none; outline: 0; @@ -111,13 +111,13 @@ .carousel-control-prev { left: 0; @if $enable-gradients { - background: linear-gradient(90deg, rgba($black, .25), rgba($black, .001)); + background-image: linear-gradient(90deg, rgba($black, .25), rgba($black, .001)); } } .carousel-control-next { right: 0; @if $enable-gradients { - background: linear-gradient(270deg, rgba($black, .25), rgba($black, .001)); + background-image: linear-gradient(270deg, rgba($black, .25), rgba($black, .001)); } } @@ -127,13 +127,13 @@ display: inline-block; width: $carousel-control-icon-width; height: $carousel-control-icon-width; - background: no-repeat 50% / 100% 100%; + background: 50% / 100% 100% no-repeat; } .carousel-control-prev-icon { - background-image: $carousel-control-prev-icon-bg; + background-image: escape-svg($carousel-control-prev-icon-bg); } .carousel-control-next-icon { - background-image: $carousel-control-next-icon-bg; + background-image: escape-svg($carousel-control-next-icon-bg); } diff --git a/app/assets/v3/scss/lib/bootstrap/_close.scss b/app/assets/v3/scss/lib/bootstrap/_close.scss index 5cc96f573e1..82e9593ef14 100644 --- a/app/assets/v3/scss/lib/bootstrap/_close.scss +++ b/app/assets/v3/scss/lib/bootstrap/_close.scss @@ -8,13 +8,13 @@ opacity: .5; // Override 's hover style - @include hover { + @include hover() { color: $close-color; text-decoration: none; } &:not(:disabled):not(.disabled) { - @include hover-focus { + @include hover-focus() { opacity: .75; } } @@ -30,7 +30,6 @@ button.close { padding: 0; background-color: transparent; border: 0; - appearance: none; } // Future-proof disabling of clicks on `` elements diff --git a/app/assets/v3/scss/lib/bootstrap/_code.scss b/app/assets/v3/scss/lib/bootstrap/_code.scss index 74b6e1c89be..4bc117a96de 100644 --- a/app/assets/v3/scss/lib/bootstrap/_code.scss +++ b/app/assets/v3/scss/lib/bootstrap/_code.scss @@ -2,7 +2,7 @@ code { @include font-size($code-font-size); color: $code-color; - word-break: break-word; + word-wrap: break-word; // Streamline the style when inside anchors to avoid broken underline and more a > & { diff --git a/app/assets/v3/scss/lib/bootstrap/_custom-forms.scss b/app/assets/v3/scss/lib/bootstrap/_custom-forms.scss index 03f3fc5be2d..06725ff3644 100644 --- a/app/assets/v3/scss/lib/bootstrap/_custom-forms.scss +++ b/app/assets/v3/scss/lib/bootstrap/_custom-forms.scss @@ -9,9 +9,11 @@ .custom-control { position: relative; + z-index: 1; display: block; min-height: $font-size-base * $line-height-base; padding-left: $custom-control-gutter + $custom-control-indicator-size; + color-adjust: exact; // Keep themed appearance for print } .custom-control-inline { @@ -21,7 +23,10 @@ .custom-control-input { position: absolute; + left: 0; z-index: -1; // Put the input behind the label so it doesn't overlay text + width: $custom-control-indicator-size; + height: ($font-size-base * $line-height-base + $custom-control-indicator-size) / 2; opacity: 0; &:checked ~ .custom-control-label::before { @@ -34,7 +39,7 @@ &:focus ~ .custom-control-label::before { // the mixin is not used here to make sure there is feedback @if $enable-shadows { - box-shadow: $input-box-shadow, $input-focus-box-shadow; + box-shadow: $input-box-shadow, $custom-control-indicator-focus-box-shadow; } @else { box-shadow: $custom-control-indicator-focus-box-shadow; } @@ -51,6 +56,8 @@ @include box-shadow($custom-control-indicator-active-box-shadow); } + // Use [disabled] and :disabled to work around https://github.com/twbs/bootstrap/issues/28247 + &[disabled], &:disabled { ~ .custom-control-label { color: $custom-control-label-disabled-color; @@ -69,7 +76,9 @@ .custom-control-label { position: relative; margin-bottom: 0; + color: $custom-control-label-color; vertical-align: top; + cursor: $custom-control-cursor; // Background-color and (when enabled) gradient &::before { @@ -95,7 +104,7 @@ width: $custom-control-indicator-size; height: $custom-control-indicator-size; content: ""; - background: no-repeat 50% / #{$custom-control-indicator-bg-size}; + background: 50% / #{$custom-control-indicator-bg-size} no-repeat; } } @@ -111,7 +120,7 @@ .custom-control-input:checked ~ .custom-control-label { &::after { - background-image: $custom-checkbox-indicator-icon-checked; + background-image: escape-svg($custom-checkbox-indicator-icon-checked); } } @@ -122,16 +131,16 @@ @include box-shadow($custom-checkbox-indicator-indeterminate-box-shadow); } &::after { - background-image: $custom-checkbox-indicator-icon-indeterminate; + background-image: escape-svg($custom-checkbox-indicator-icon-indeterminate); } } .custom-control-input:disabled { &:checked ~ .custom-control-label::before { - background-color: $custom-control-indicator-checked-disabled-bg; + @include gradient-bg($custom-control-indicator-checked-disabled-bg); } &:indeterminate ~ .custom-control-label::before { - background-color: $custom-control-indicator-checked-disabled-bg; + @include gradient-bg($custom-control-indicator-checked-disabled-bg); } } } @@ -142,19 +151,19 @@ .custom-radio { .custom-control-label::before { - // stylelint-disable-next-line property-blacklist + // stylelint-disable-next-line property-disallowed-list border-radius: $custom-radio-indicator-border-radius; } .custom-control-input:checked ~ .custom-control-label { &::after { - background-image: $custom-radio-indicator-icon-checked; + background-image: escape-svg($custom-radio-indicator-icon-checked); } } .custom-control-input:disabled { &:checked ~ .custom-control-label::before { - background-color: $custom-control-indicator-checked-disabled-bg; + @include gradient-bg($custom-control-indicator-checked-disabled-bg); } } } @@ -172,17 +181,17 @@ left: -($custom-switch-width + $custom-control-gutter); width: $custom-switch-width; pointer-events: all; - // stylelint-disable-next-line property-blacklist + // stylelint-disable-next-line property-disallowed-list border-radius: $custom-switch-indicator-border-radius; } &::after { - top: calc(#{(($font-size-base * $line-height-base - $custom-control-indicator-size) / 2)} + #{$custom-control-indicator-border-width * 2}); - left: calc(#{-($custom-switch-width + $custom-control-gutter)} + #{$custom-control-indicator-border-width * 2}); + top: add(($font-size-base * $line-height-base - $custom-control-indicator-size) / 2, $custom-control-indicator-border-width * 2); + left: add(-($custom-switch-width + $custom-control-gutter), $custom-control-indicator-border-width * 2); width: $custom-switch-indicator-size; height: $custom-switch-indicator-size; background-color: $custom-control-indicator-border-color; - // stylelint-disable-next-line property-blacklist + // stylelint-disable-next-line property-disallowed-list border-radius: $custom-switch-indicator-border-radius; @include transition(transform .15s ease-in-out, $custom-forms-transition); } @@ -197,7 +206,7 @@ .custom-control-input:disabled { &:checked ~ .custom-control-label::before { - background-color: $custom-control-indicator-checked-disabled-bg; + @include gradient-bg($custom-control-indicator-checked-disabled-bg); } } } @@ -220,8 +229,7 @@ line-height: $custom-select-line-height; color: $custom-select-color; vertical-align: middle; - background: $custom-select-background; - background-color: $custom-select-bg; + background: $custom-select-bg $custom-select-background; border: $custom-select-border-width solid $custom-select-border-color; @include border-radius($custom-select-border-radius, 0); @include box-shadow($custom-select-box-shadow); @@ -231,8 +239,9 @@ border-color: $custom-select-focus-border-color; outline: 0; @if $enable-shadows { - box-shadow: $custom-select-box-shadow, $custom-select-focus-box-shadow; + @include box-shadow($custom-select-box-shadow, $custom-select-focus-box-shadow); } @else { + // Avoid using mixin so we can pass custom focus shadow properly box-shadow: $custom-select-focus-box-shadow; } @@ -263,6 +272,12 @@ &::-ms-expand { display: none; } + + // Remove outline from select box in FF + &:-moz-focusring { + color: transparent; + text-shadow: 0 0 0 $custom-select-color; + } } .custom-select-sm { @@ -300,6 +315,7 @@ width: 100%; height: $custom-file-height; margin: 0; + overflow: hidden; opacity: 0; &:focus ~ .custom-file-label { @@ -307,6 +323,8 @@ box-shadow: $custom-file-focus-box-shadow; } + // Use [disabled] and :disabled to work around https://github.com/twbs/bootstrap/issues/28247 + &[disabled] ~ .custom-file-label, &:disabled ~ .custom-file-label { background-color: $custom-file-disabled-bg; } @@ -330,6 +348,7 @@ z-index: 1; height: $custom-file-height; padding: $custom-file-padding-y $custom-file-padding-x; + overflow: hidden; font-family: $custom-file-font-family; font-weight: $custom-file-font-weight; line-height: $custom-file-line-height; @@ -365,13 +384,13 @@ .custom-range { width: 100%; - height: calc(#{$custom-range-thumb-height} + #{$custom-range-thumb-focus-box-shadow-width * 2}); + height: add($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; + outline: 0; // Pseudo-elements must be split across multiple rulesets to have an effect. // No box-shadow() mixin for focus accessibility. diff --git a/app/assets/v3/scss/lib/bootstrap/_dropdown.scss b/app/assets/v3/scss/lib/bootstrap/_dropdown.scss index ac3c8c8a2c5..f39de118576 100644 --- a/app/assets/v3/scss/lib/bootstrap/_dropdown.scss +++ b/app/assets/v3/scss/lib/bootstrap/_dropdown.scss @@ -10,7 +10,7 @@ white-space: nowrap; // Generate the caret automatically - @include caret; + @include caret(); } // The dropdown menu @@ -22,7 +22,7 @@ display: none; // none by default, but block on "open" of the menu float: left; min-width: $dropdown-min-width; - padding: $dropdown-padding-y 0; + padding: $dropdown-padding-y $dropdown-padding-x; margin: $dropdown-spacer 0 0; // override default ul @include font-size($dropdown-font-size); color: $dropdown-color; @@ -100,7 +100,7 @@ } } -// When enabled Popper.js, reset basic dropdown position +// When Popper is enabled, reset the basic dropdown position // stylelint-disable-next-line no-duplicate-selectors .dropdown-menu { &[x-placement^="top"], @@ -114,7 +114,7 @@ // Dividers (basically an `
`) within the dropdown .dropdown-divider { - @include nav-divider($dropdown-divider-bg, $dropdown-divider-margin-y); + @include nav-divider($dropdown-divider-bg, $dropdown-divider-margin-y, true); } // Links, buttons, and more within the dropdown menu @@ -128,6 +128,7 @@ font-weight: $font-weight-normal; color: $dropdown-link-color; text-align: inherit; // For `