From 3ebbd2728ec7566e83833fe669bb9d61753089d7 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Tue, 28 Apr 2020 16:14:23 -0500 Subject: [PATCH] Update bootstrap --- _sass/bootstrap/_alert.scss | 0 _sass/bootstrap/_badge.scss | 2 +- _sass/bootstrap/_breadcrumb.scss | 3 +- _sass/bootstrap/_button-group.scss | 2 +- _sass/bootstrap/_buttons.scss | 6 +- _sass/bootstrap/_card.scss | 45 ++++------- _sass/bootstrap/_carousel.scss | 12 +-- _sass/bootstrap/_close.scss | 4 +- _sass/bootstrap/_code.scss | 2 +- _sass/bootstrap/_custom-forms.scss | 30 +++++-- _sass/bootstrap/_dropdown.scss | 6 +- _sass/bootstrap/_forms.scss | 26 +++--- _sass/bootstrap/_functions.scss | 50 +++++++++++- _sass/bootstrap/_grid.scss | 33 ++++++-- _sass/bootstrap/_images.scss | 4 +- _sass/bootstrap/_input-group.scss | 6 +- _sass/bootstrap/_jumbotron.scss | 0 _sass/bootstrap/_list-group.scss | 53 +++++++------ _sass/bootstrap/_media.scss | 0 _sass/bootstrap/_mixins.scss | 6 +- _sass/bootstrap/_modal.scss | 40 ++++++---- _sass/bootstrap/_nav.scss | 6 +- _sass/bootstrap/_navbar.scss | 60 ++++++++++---- _sass/bootstrap/_pagination.scss | 4 +- _sass/bootstrap/_popover.scss | 17 ++-- _sass/bootstrap/_print.scss | 4 +- _sass/bootstrap/_progress.scss | 7 +- _sass/bootstrap/_reboot.scss | 27 +++---- _sass/bootstrap/_root.scss | 1 + _sass/bootstrap/_spinners.scss | 0 _sass/bootstrap/_tables.scss | 6 +- _sass/bootstrap/_toasts.scss | 0 _sass/bootstrap/_tooltip.scss | 0 _sass/bootstrap/_transitions.scss | 0 _sass/bootstrap/_type.scss | 4 +- _sass/bootstrap/_utilities.scss | 0 _sass/bootstrap/_variables.scss | 65 +++++++++------ _sass/bootstrap/bootstrap-grid.scss | 2 +- _sass/bootstrap/bootstrap-reboot.scss | 2 +- _sass/bootstrap/mixins/_alert.scss | 0 .../bootstrap/mixins/_background-variant.scss | 5 +- _sass/bootstrap/mixins/_badge.scss | 2 +- _sass/bootstrap/mixins/_border-radius.scss | 0 _sass/bootstrap/mixins/_box-shadow.scss | 0 _sass/bootstrap/mixins/_breakpoints.scss | 0 _sass/bootstrap/mixins/_buttons.scss | 7 +- _sass/bootstrap/mixins/_caret.scss | 16 ++-- _sass/bootstrap/mixins/_clearfix.scss | 0 _sass/bootstrap/mixins/_deprecate.scss | 0 _sass/bootstrap/mixins/_float.scss | 6 +- _sass/bootstrap/mixins/_forms.scss | 79 ++++++++----------- _sass/bootstrap/mixins/_gradients.scss | 0 _sass/bootstrap/mixins/_grid-framework.scss | 11 ++- _sass/bootstrap/mixins/_grid.scss | 18 +++++ _sass/bootstrap/mixins/_hover.scss | 8 +- _sass/bootstrap/mixins/_image.scss | 2 +- _sass/bootstrap/mixins/_list-group.scss | 2 +- _sass/bootstrap/mixins/_lists.scss | 2 +- _sass/bootstrap/mixins/_nav-divider.scss | 3 +- _sass/bootstrap/mixins/_pagination.scss | 0 _sass/bootstrap/mixins/_reset-text.scss | 2 +- _sass/bootstrap/mixins/_resize.scss | 0 _sass/bootstrap/mixins/_screen-reader.scss | 5 +- _sass/bootstrap/mixins/_size.scss | 0 _sass/bootstrap/mixins/_table-row.scss | 2 +- _sass/bootstrap/mixins/_text-emphasis.scss | 5 +- _sass/bootstrap/mixins/_text-hide.scss | 0 _sass/bootstrap/mixins/_text-truncate.scss | 0 _sass/bootstrap/mixins/_transition.scss | 0 _sass/bootstrap/mixins/_visibility.scss | 0 _sass/bootstrap/utilities/_align.scss | 0 _sass/bootstrap/utilities/_background.scss | 2 +- _sass/bootstrap/utilities/_borders.scss | 0 _sass/bootstrap/utilities/_clearfix.scss | 0 _sass/bootstrap/utilities/_display.scss | 0 _sass/bootstrap/utilities/_embed.scss | 0 _sass/bootstrap/utilities/_flex.scss | 0 _sass/bootstrap/utilities/_float.scss | 0 _sass/bootstrap/utilities/_overflow.scss | 0 _sass/bootstrap/utilities/_position.scss | 0 _sass/bootstrap/utilities/_screenreaders.scss | 0 _sass/bootstrap/utilities/_shadows.scss | 0 _sass/bootstrap/utilities/_sizing.scss | 0 _sass/bootstrap/utilities/_spacing.scss | 0 .../bootstrap/utilities/_stretched-link.scss | 0 _sass/bootstrap/utilities/_text.scss | 4 +- _sass/bootstrap/utilities/_visibility.scss | 0 _sass/bootstrap/vendor/_rfs.scss | 0 88 files changed, 439 insertions(+), 277 deletions(-) mode change 100755 => 100644 _sass/bootstrap/_alert.scss mode change 100755 => 100644 _sass/bootstrap/_badge.scss mode change 100755 => 100644 _sass/bootstrap/_breadcrumb.scss mode change 100755 => 100644 _sass/bootstrap/_button-group.scss mode change 100755 => 100644 _sass/bootstrap/_buttons.scss mode change 100755 => 100644 _sass/bootstrap/_card.scss mode change 100755 => 100644 _sass/bootstrap/_carousel.scss mode change 100755 => 100644 _sass/bootstrap/_close.scss mode change 100755 => 100644 _sass/bootstrap/_code.scss mode change 100755 => 100644 _sass/bootstrap/_custom-forms.scss mode change 100755 => 100644 _sass/bootstrap/_dropdown.scss mode change 100755 => 100644 _sass/bootstrap/_forms.scss mode change 100755 => 100644 _sass/bootstrap/_functions.scss mode change 100755 => 100644 _sass/bootstrap/_grid.scss mode change 100755 => 100644 _sass/bootstrap/_images.scss mode change 100755 => 100644 _sass/bootstrap/_input-group.scss mode change 100755 => 100644 _sass/bootstrap/_jumbotron.scss mode change 100755 => 100644 _sass/bootstrap/_list-group.scss mode change 100755 => 100644 _sass/bootstrap/_media.scss mode change 100755 => 100644 _sass/bootstrap/_mixins.scss mode change 100755 => 100644 _sass/bootstrap/_modal.scss mode change 100755 => 100644 _sass/bootstrap/_nav.scss mode change 100755 => 100644 _sass/bootstrap/_navbar.scss mode change 100755 => 100644 _sass/bootstrap/_pagination.scss mode change 100755 => 100644 _sass/bootstrap/_popover.scss mode change 100755 => 100644 _sass/bootstrap/_print.scss mode change 100755 => 100644 _sass/bootstrap/_progress.scss mode change 100755 => 100644 _sass/bootstrap/_reboot.scss mode change 100755 => 100644 _sass/bootstrap/_root.scss mode change 100755 => 100644 _sass/bootstrap/_spinners.scss mode change 100755 => 100644 _sass/bootstrap/_tables.scss mode change 100755 => 100644 _sass/bootstrap/_toasts.scss mode change 100755 => 100644 _sass/bootstrap/_tooltip.scss mode change 100755 => 100644 _sass/bootstrap/_transitions.scss mode change 100755 => 100644 _sass/bootstrap/_type.scss mode change 100755 => 100644 _sass/bootstrap/_utilities.scss mode change 100755 => 100644 _sass/bootstrap/_variables.scss mode change 100755 => 100644 _sass/bootstrap/bootstrap-grid.scss mode change 100755 => 100644 _sass/bootstrap/bootstrap-reboot.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_alert.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_background-variant.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_badge.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_border-radius.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_box-shadow.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_breakpoints.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_buttons.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_caret.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_clearfix.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_deprecate.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_float.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_forms.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_gradients.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_grid-framework.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_grid.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_hover.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_image.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_list-group.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_lists.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_nav-divider.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_pagination.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_reset-text.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_resize.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_screen-reader.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_size.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_table-row.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_text-emphasis.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_text-hide.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_text-truncate.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_transition.scss mode change 100755 => 100644 _sass/bootstrap/mixins/_visibility.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_align.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_background.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_borders.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_clearfix.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_display.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_embed.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_flex.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_float.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_overflow.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_position.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_screenreaders.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_shadows.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_sizing.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_spacing.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_stretched-link.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_text.scss mode change 100755 => 100644 _sass/bootstrap/utilities/_visibility.scss mode change 100755 => 100644 _sass/bootstrap/vendor/_rfs.scss diff --git a/_sass/bootstrap/_alert.scss b/_sass/bootstrap/_alert.scss old mode 100755 new mode 100644 diff --git a/_sass/bootstrap/_badge.scss b/_sass/bootstrap/_badge.scss old mode 100755 new mode 100644 index 2082f058..42c5d08d --- a/_sass/bootstrap/_badge.scss +++ b/_sass/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/_sass/bootstrap/_breadcrumb.scss b/_sass/bootstrap/_breadcrumb.scss old mode 100755 new mode 100644 index be309506..d748894f --- a/_sass/bootstrap/_breadcrumb.scss +++ b/_sass/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); @@ -17,7 +18,7 @@ display: inline-block; // Suppress underlining of the separator in modern browsers padding-right: $breadcrumb-item-padding; color: $breadcrumb-divider-color; - content: $breadcrumb-divider; + content: escape-svg($breadcrumb-divider); } } diff --git a/_sass/bootstrap/_button-group.scss b/_sass/bootstrap/_button-group.scss old mode 100755 new mode 100644 index d7220029..da02d793 --- a/_sass/bootstrap/_button-group.scss +++ b/_sass/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/_sass/bootstrap/_buttons.scss b/_sass/bootstrap/_buttons.scss old mode 100755 new mode 100644 index 2a7d94ad..e87d3393 --- a/_sass/bootstrap/_buttons.scss +++ b/_sass/bootstrap/_buttons.scss @@ -10,14 +10,16 @@ font-weight: $btn-font-weight; color: $body-color; text-align: center; + white-space: $btn-white-space; vertical-align: middle; + cursor: if($enable-pointer-cursor-for-buttons, pointer, null); user-select: none; background-color: transparent; border: $btn-border-width solid transparent; @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; } @@ -79,7 +81,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; } diff --git a/_sass/bootstrap/_card.scss b/_sass/bootstrap/_card.scss old mode 100755 new mode 100644 index c6b67ce0..d6759fde --- a/_sass/bootstrap/_card.scss +++ b/_sass/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; @@ -35,6 +36,9 @@ // 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 +57,7 @@ } .card-link { - @include hover { + @include hover() { text-decoration: none; } @@ -121,19 +125,20 @@ padding: $card-img-overlay-padding; } -.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 +146,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 +172,6 @@ // .card-group { - display: flex; - flex-direction: column; - // The child selector allows nested `.card` within `.card-group` // to display properly. > .card { @@ -181,6 +179,7 @@ } @include media-breakpoint-up(sm) { + display: flex; flex-flow: row wrap; // The child selector allows nested `.card` within `.card-group` // to display properly. @@ -262,27 +261,17 @@ > .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/_sass/bootstrap/_carousel.scss b/_sass/bootstrap/_carousel.scss old mode 100755 new mode 100644 index 20ea04ba..fb5e9f85 --- a/_sass/bootstrap/_carousel.scss +++ b/_sass/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)); } } @@ -130,10 +130,10 @@ background: no-repeat 50% / 100% 100%; } .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/_sass/bootstrap/_close.scss b/_sass/bootstrap/_close.scss old mode 100755 new mode 100644 index 5cc96f57..071aebe8 --- a/_sass/bootstrap/_close.scss +++ b/_sass/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; } } diff --git a/_sass/bootstrap/_code.scss b/_sass/bootstrap/_code.scss old mode 100755 new mode 100644 index 74b6e1c8..4bc117a9 --- a/_sass/bootstrap/_code.scss +++ b/_sass/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/_sass/bootstrap/_custom-forms.scss b/_sass/bootstrap/_custom-forms.scss old mode 100755 new mode 100644 index 03f3fc5b..21e72da7 --- a/_sass/bootstrap/_custom-forms.scss +++ b/_sass/bootstrap/_custom-forms.scss @@ -21,7 +21,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 { @@ -51,6 +54,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 +74,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 { @@ -111,7 +118,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,7 +129,7 @@ @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); } } @@ -148,7 +155,7 @@ .custom-control-input:checked ~ .custom-control-label { &::after { - background-image: $custom-radio-indicator-icon-checked; + background-image: escape-svg($custom-radio-indicator-icon-checked); } } @@ -177,8 +184,8 @@ } &::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; @@ -220,8 +227,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); @@ -263,6 +269,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 { @@ -307,6 +319,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; } @@ -365,7 +379,7 @@ .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; diff --git a/_sass/bootstrap/_dropdown.scss b/_sass/bootstrap/_dropdown.scss old mode 100755 new mode 100644 index ac3c8c8a..76f33a4f --- a/_sass/bootstrap/_dropdown.scss +++ b/_sass/bootstrap/_dropdown.scss @@ -10,7 +10,7 @@ white-space: nowrap; // Generate the caret automatically - @include caret; + @include caret(); } // The dropdown menu @@ -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 @@ -144,7 +144,7 @@ } } - @include hover-focus { + @include hover-focus() { color: $dropdown-link-hover-color; text-decoration: none; @include gradient-bg($dropdown-link-hover-bg); diff --git a/_sass/bootstrap/_forms.scss b/_sass/bootstrap/_forms.scss old mode 100755 new mode 100644 index ec9c3355..b2edb7b2 --- a/_sass/bootstrap/_forms.scss +++ b/_sass/bootstrap/_forms.scss @@ -30,8 +30,14 @@ border: 0; } + // Remove select outline from select box in FF + &:-moz-focusring { + color: transparent; + text-shadow: 0 0 0 $input-color; + } + // Customize the `:focus` state to imitate native WebKit styles. - @include form-control-focus(); + @include form-control-focus($ignore-warning: true); // Placeholder &::placeholder { @@ -80,23 +86,23 @@ select.form-control { // For use with horizontal and inline forms, when you need the label (or legend) // text to align with the form controls. .col-form-label { - padding-top: calc(#{$input-padding-y} + #{$input-border-width}); - padding-bottom: calc(#{$input-padding-y} + #{$input-border-width}); + padding-top: add($input-padding-y, $input-border-width); + padding-bottom: add($input-padding-y, $input-border-width); margin-bottom: 0; // Override the `