Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Easier disabled state customization for button variants #30639

Merged
merged 7 commits into from
Jul 12, 2020
Merged

Easier disabled state customization for button variants #30639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0faa9ea
feat(buttons): easier disabled state customization
ffoodd Apr 23, 2020
44c7ade
docs(migration): mention new arguments for disabled state in button-v…
ffoodd Jun 24, 2020
67dc010
Merge branch 'main' into master-fod-disabled-button-args
XhmikosR Jul 6, 2020
4360296
Update migration.md
XhmikosR Jul 6, 2020
f8e1990
Update migration.md
XhmikosR Jul 6, 2020
d2c1e22
Update migration.md
mdo Jul 11, 2020
6cb7410
Merge branch 'main' into master-fod-disabled-button-args
XhmikosR Jul 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions scss/mixins/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
$hover-color: color-contrast($hover-background),
$active-background: darken($background, 10%),
$active-border: darken($border, 12.5%),
$active-color: color-contrast($active-background)
$active-color: color-contrast($active-background),
$disabled-background: $background,
$disabled-border: $border,
$disabled-color: color-contrast($disabled-background)
) {
color: $color;
@include gradient-bg($background);
Expand Down Expand Up @@ -61,11 +64,11 @@

&:disabled,
&.disabled {
color: $color;
background-color: $background;
color: $disabled-color;
background-color: $disabled-background;
// Remove CSS gradients if they're enabled
background-image: if($enable-gradients, none, null);
border-color: $border;
border-color: $disabled-border;
}
}

Expand Down
4 changes: 4 additions & 0 deletions site/content/docs/5.0/migration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ toc: true

### Components

#### Buttons

- Disabled states of buttons are easier to customize thanks to additional arguments in the `button-variant()` mixin. [See #30639.](https://github.com/twbs/bootstrap/pull/30639)

#### Popovers

- Renamed `whiteList` option to `allowList`
Expand Down