diff options
Diffstat (limited to 'npm_assets/node_modules/bootstrap/scss/mixins')
4 files changed, 27 insertions, 17 deletions
diff --git a/npm_assets/node_modules/bootstrap/scss/mixins/_forms.scss b/npm_assets/node_modules/bootstrap/scss/mixins/_forms.scss index a321630..b8847cc 100644 --- a/npm_assets/node_modules/bootstrap/scss/mixins/_forms.scss +++ b/npm_assets/node_modules/bootstrap/scss/mixins/_forms.scss @@ -69,7 +69,7 @@ // Align tooltip to form elements .form-row > .col > &, .form-row > [class*="col-"] > & { - left: $form-grid-gutter-width / 2; + left: $form-grid-gutter-width * .5; } } @@ -85,7 +85,7 @@ border-color: $color; @if $enable-validation-icons { - padding-right: $input-height-inner; + padding-right: $input-height-inner !important; // stylelint-disable-line declaration-no-important background-image: escape-svg($icon); background-repeat: no-repeat; background-position: right $input-height-inner-quarter center; @@ -100,6 +100,16 @@ } // stylelint-disable-next-line selector-no-qualifying-type + select.form-control { + @include form-validation-state-selector($state) { + @if $enable-validation-icons { + padding-right: $input-padding-x * 4 !important; // stylelint-disable-line declaration-no-important + background-position: right $input-padding-x * 2 center; + } + } + } + + // stylelint-disable-next-line selector-no-qualifying-type textarea.form-control { @include form-validation-state-selector($state) { @if $enable-validation-icons { @@ -114,7 +124,7 @@ border-color: $color; @if $enable-validation-icons { - padding-right: $custom-select-feedback-icon-padding-right; + padding-right: $custom-select-feedback-icon-padding-right !important; // stylelint-disable-line declaration-no-important background: $custom-select-background, $custom-select-bg escape-svg($icon) $custom-select-feedback-icon-position / $custom-select-feedback-icon-size no-repeat; } diff --git a/npm_assets/node_modules/bootstrap/scss/mixins/_grid-framework.scss b/npm_assets/node_modules/bootstrap/scss/mixins/_grid-framework.scss index 6fc8e85..ef32917 100644 --- a/npm_assets/node_modules/bootstrap/scss/mixins/_grid-framework.scss +++ b/npm_assets/node_modules/bootstrap/scss/mixins/_grid-framework.scss @@ -8,8 +8,8 @@ %grid-column { position: relative; width: 100%; - padding-right: $gutter / 2; - padding-left: $gutter / 2; + padding-right: $gutter * .5; + padding-left: $gutter * .5; } @each $breakpoint in map-keys($breakpoints) { diff --git a/npm_assets/node_modules/bootstrap/scss/mixins/_grid.scss b/npm_assets/node_modules/bootstrap/scss/mixins/_grid.scss index 19babc0..0eb0991 100644 --- a/npm_assets/node_modules/bootstrap/scss/mixins/_grid.scss +++ b/npm_assets/node_modules/bootstrap/scss/mixins/_grid.scss @@ -4,8 +4,8 @@ @mixin make-container($gutter: $grid-gutter-width) { width: 100%; - padding-right: $gutter / 2; - padding-left: $gutter / 2; + padding-right: $gutter * .5; + padding-left: $gutter * .5; margin-right: auto; margin-left: auto; } @@ -13,8 +13,8 @@ @mixin make-row($gutter: $grid-gutter-width) { display: flex; flex-wrap: wrap; - margin-right: -$gutter / 2; - margin-left: -$gutter / 2; + margin-right: -$gutter * .5; + margin-left: -$gutter * .5; } // For each breakpoint, define the maximum width of the container in a media query @@ -33,16 +33,16 @@ // always setting `width: 100%;`. This works because we use `flex` values // later on to override this initial width. width: 100%; - padding-right: $gutter / 2; - padding-left: $gutter / 2; + padding-right: $gutter * .5; + padding-left: $gutter * .5; } @mixin make-col($size, $columns: $grid-columns) { - flex: 0 0 percentage($size / $columns); + flex: 0 0 percentage(divide($size, $columns)); // Add a `max-width` to ensure content within each column does not blow out // the width of the column. Applies to IE10+ and Firefox. Chrome and Safari // do not appear to require this. - max-width: percentage($size / $columns); + max-width: percentage(divide($size, $columns)); } @mixin make-col-auto() { @@ -52,7 +52,7 @@ } @mixin make-col-offset($size, $columns: $grid-columns) { - $num: $size / $columns; + $num: divide($size, $columns); margin-left: if($num == 0, 0, percentage($num)); } @@ -63,7 +63,7 @@ // style grid. @mixin row-cols($count) { > * { - flex: 0 0 100% / $count; - max-width: 100% / $count; + flex: 0 0 divide(100%, $count); + max-width: divide(100%, $count); } } diff --git a/npm_assets/node_modules/bootstrap/scss/mixins/_screen-reader.scss b/npm_assets/node_modules/bootstrap/scss/mixins/_screen-reader.scss index 6913442..70b677e 100644 --- a/npm_assets/node_modules/bootstrap/scss/mixins/_screen-reader.scss +++ b/npm_assets/node_modules/bootstrap/scss/mixins/_screen-reader.scss @@ -1,7 +1,7 @@ // Only display content to screen readers // // See: https://www.a11yproject.com/posts/2013-01-11-how-to-hide-content/ -// See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/ +// See: https://kittygiraudel.com/2016/10/13/css-hide-and-seek/ @mixin sr-only() { position: absolute; |