mirror of https://github.com/twbs/bootstrap.git
Minor Sass consistency changes. (#24677)
* use `background-color` instead of the shorthand * use `outline: 0` consistently * fix transform order * remove quotes from `SFMono-Regular`
This commit is contained in:
parent
f74fe3a45b
commit
34d745540d
|
@ -22,7 +22,7 @@
|
||||||
// stylelint-disable property-no-vendor-prefix, selector-no-qualifying-type
|
// stylelint-disable property-no-vendor-prefix, selector-no-qualifying-type
|
||||||
button.close {
|
button.close {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
background: transparent;
|
background-color: transparent;
|
||||||
border: 0;
|
border: 0;
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
}
|
}
|
||||||
|
|
|
@ -148,7 +148,7 @@
|
||||||
|
|
||||||
&:focus {
|
&:focus {
|
||||||
border-color: $custom-select-focus-border-color;
|
border-color: $custom-select-focus-border-color;
|
||||||
outline: none;
|
outline: 0;
|
||||||
@include box-shadow($custom-select-focus-box-shadow);
|
@include box-shadow($custom-select-focus-box-shadow);
|
||||||
|
|
||||||
&::-ms-value {
|
&::-ms-value {
|
||||||
|
|
|
@ -89,7 +89,7 @@
|
||||||
color: $dropdown-link-color;
|
color: $dropdown-link-color;
|
||||||
text-align: inherit; // For `<button>`s
|
text-align: inherit; // For `<button>`s
|
||||||
white-space: nowrap; // prevent links from randomly breaking onto new lines
|
white-space: nowrap; // prevent links from randomly breaking onto new lines
|
||||||
background: none; // For `<button>`s
|
background-color: transparent; // For `<button>`s
|
||||||
border: 0; // For `<button>`s
|
border: 0; // For `<button>`s
|
||||||
|
|
||||||
@include hover-focus {
|
@include hover-focus {
|
||||||
|
|
|
@ -109,7 +109,7 @@
|
||||||
padding: $navbar-toggler-padding-y $navbar-toggler-padding-x;
|
padding: $navbar-toggler-padding-y $navbar-toggler-padding-x;
|
||||||
font-size: $navbar-toggler-font-size;
|
font-size: $navbar-toggler-font-size;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
background: transparent; // remove default button style
|
background-color: transparent; // remove default button style
|
||||||
border: $border-width solid transparent; // remove default button style
|
border: $border-width solid transparent; // remove default button style
|
||||||
@include border-radius($navbar-toggler-border-radius);
|
@include border-radius($navbar-toggler-border-radius);
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,7 @@ body {
|
||||||
//
|
//
|
||||||
// Credit: https://github.com/suitcss/base
|
// Credit: https://github.com/suitcss/base
|
||||||
[tabindex="-1"]:focus {
|
[tabindex="-1"]:focus {
|
||||||
outline: none !important;
|
outline: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -221,7 +221,7 @@ $transition-collapse: height .35s ease !default;
|
||||||
|
|
||||||
// stylelint-disable value-keyword-case
|
// 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" !default;
|
||||||
$font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
|
$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
|
||||||
$font-family-base: $font-family-sans-serif !default;
|
$font-family-base: $font-family-sans-serif !default;
|
||||||
// stylelint-enable value-keyword-case
|
// stylelint-enable value-keyword-case
|
||||||
|
|
||||||
|
@ -416,7 +416,7 @@ $input-height-sm: calc(#{$input-height-inner-sm} + #{$inpu
|
||||||
$input-height-inner-lg: ($font-size-lg * $input-btn-line-height-lg) + ($input-btn-padding-y-lg * 2) !default;
|
$input-height-inner-lg: ($font-size-lg * $input-btn-line-height-lg) + ($input-btn-padding-y-lg * 2) !default;
|
||||||
$input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) !default;
|
$input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) !default;
|
||||||
|
|
||||||
$input-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s !default;
|
$input-transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
|
||||||
|
|
||||||
$form-text-margin-top: .25rem !default;
|
$form-text-margin-top: .25rem !default;
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
color: $input-focus-color;
|
color: $input-focus-color;
|
||||||
background-color: $input-focus-bg;
|
background-color: $input-focus-bg;
|
||||||
border-color: $input-focus-border-color;
|
border-color: $input-focus-border-color;
|
||||||
outline: none;
|
outline: 0;
|
||||||
// Avoid using mixin so we can pass custom focus shadow properly
|
// Avoid using mixin so we can pass custom focus shadow properly
|
||||||
@if $enable-shadows {
|
@if $enable-shadows {
|
||||||
box-shadow: $input-box-shadow, $input-focus-box-shadow;
|
box-shadow: $input-box-shadow, $input-focus-box-shadow;
|
||||||
|
|
Loading…
Reference in New Issue