Skip to content

Commit

Permalink
fix: update disabled btn state
Browse files Browse the repository at this point in the history
  • Loading branch information
danielmatthew committed Jun 11, 2021
1 parent 2ad1a53 commit e30751e
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 29 deletions.
26 changes: 14 additions & 12 deletions assets/stylesheets/bootstrap/mixins/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// Easily pump out default styles, as well as :hover, :focus, :active,
// and disabled options for all buttons

$btn-disabled-color: #69727F;

@mixin button-variant-plain($color, $background) {
color: $color;
background-color: $background;
Expand Down Expand Up @@ -49,8 +51,8 @@
&[disabled],
fieldset[disabled] {
background-color: $white;
border-color: #ADB5BD;
color: #ADB5BD;
border-color: $btn-disabled-color;
color: $btn-disabled-color;
}

&.disabled,
Expand All @@ -60,8 +62,8 @@
&:focus,
&.focus {
background-color: $white;
border-color: #ADB5BD;
color: #ADB5BD;
border-color: $btn-disabled-color;
color: $btn-disabled-color;
box-shadow: none;
}
}
Expand Down Expand Up @@ -112,8 +114,8 @@
&.disabled,
&[disabled],
fieldset[disabled] {
background-color: #ADB5BD;
border-color: #ADB5BD;
background-color: $btn-disabled-color;
border-color: $btn-disabled-color;
color: $white;
box-shadow: none;
}
Expand All @@ -127,8 +129,8 @@
&:hover,
&:focus,
&.focus {
background-color: #ADB5BD;
border-color: #ADB5BD;
background-color: $btn-disabled-color;
border-color: $btn-disabled-color;
color: $white;
box-shadow: none;
}
Expand Down Expand Up @@ -193,8 +195,8 @@
&.disabled,
&[disabled],
fieldset[disabled] {
background-color: #ADB5BD;
border-color: #ADB5BD;
background-color: $btn-disabled-color;
border-color: $btn-disabled-color;
color: $white;
box-shadow: none;
}
Expand All @@ -208,8 +210,8 @@
&:hover,
&:focus,
&.focus {
background-color: #ADB5BD;
border-color: #ADB5BD;
background-color: $btn-disabled-color;
border-color: $btn-disabled-color;
color: $white;
box-shadow: none;
}
Expand Down
32 changes: 16 additions & 16 deletions dist/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/app.css.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ <h3>Large</h3>
<h3>XS</h3>
<button class="btn btn-xs btn-default">XS button</button>
<button class="btn btn-xs btn-primary">XS button</button>
<button class="btn btn-xs btn-primary" disabled>XS button</button>
<button class="btn btn-xs btn-default" disabled>XS button</button>
</div>
</section>
<hr>
Expand Down

0 comments on commit e30751e

Please sign in to comment.