Skip to content

Commit

Permalink
Minor Sass consistency changes. (#24677)
Browse files Browse the repository at this point in the history
* use `background-color` instead of the shorthand
* use `outline: 0` consistently
* fix transform order
* remove quotes from `SFMono-Regular`
  • Loading branch information
XhmikosR authored Nov 6, 2017
1 parent f74fe3a commit 34d7455
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion scss/_close.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// stylelint-disable property-no-vendor-prefix, selector-no-qualifying-type
button.close {
padding: 0;
background: transparent;
background-color: transparent;
border: 0;
-webkit-appearance: none;
}
Expand Down
2 changes: 1 addition & 1 deletion scss/_custom-forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@

&:focus {
border-color: $custom-select-focus-border-color;
outline: none;
outline: 0;
@include box-shadow($custom-select-focus-box-shadow);

&::-ms-value {
Expand Down
2 changes: 1 addition & 1 deletion scss/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
color: $dropdown-link-color;
text-align: inherit; // For `<button>`s
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

@include hover-focus {
Expand Down
2 changes: 1 addition & 1 deletion scss/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
padding: $navbar-toggler-padding-y $navbar-toggler-padding-x;
font-size: $navbar-toggler-font-size;
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
@include border-radius($navbar-toggler-border-radius);

Expand Down
2 changes: 1 addition & 1 deletion scss/_reboot.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ body {
//
// Credit: https://github.com/suitcss/base
[tabindex="-1"]:focus {
outline: none !important;
outline: 0 !important;
}


Expand Down
4 changes: 2 additions & 2 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ $transition-collapse: height .35s ease !default;

// 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-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;
// stylelint-enable value-keyword-case

Expand Down Expand Up @@ -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-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;

Expand Down
2 changes: 1 addition & 1 deletion scss/mixins/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
color: $input-focus-color;
background-color: $input-focus-bg;
border-color: $input-focus-border-color;
outline: none;
outline: 0;
// Avoid using mixin so we can pass custom focus shadow properly
@if $enable-shadows {
box-shadow: $input-box-shadow, $input-focus-box-shadow;
Expand Down

0 comments on commit 34d7455

Please sign in to comment.