mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-07 04:54:24 +01:00
Add color argument to button mixins (#29444)
Add optional `$color` argument to `button-variant()` and `button-outline-variant()` for additional flexibility.
This commit is contained in:
parent
b3451ff258
commit
4e37fc3ab4
@ -3,35 +3,45 @@
|
|||||||
// Easily pump out default styles, as well as :hover, :focus, :active,
|
// Easily pump out default styles, as well as :hover, :focus, :active,
|
||||||
// and disabled options for all buttons
|
// and disabled options for all buttons
|
||||||
|
|
||||||
@mixin button-variant($background, $border, $hover-background: darken($background, 7.5%), $hover-border: darken($border, 10%), $active-background: darken($background, 10%), $active-border: darken($border, 12.5%)) {
|
@mixin button-variant(
|
||||||
color: color-yiq($background);
|
$background,
|
||||||
|
$border,
|
||||||
|
$color: color-yiq($background),
|
||||||
|
$hover-background: darken($background, 7.5%),
|
||||||
|
$hover-border: darken($border, 10%),
|
||||||
|
$hover-color: color-yiq($hover-background),
|
||||||
|
$active-background: darken($background, 10%),
|
||||||
|
$active-border: darken($border, 12.5%),
|
||||||
|
$active-color: color-yiq($active-background)
|
||||||
|
) {
|
||||||
|
color: $color;
|
||||||
@include gradient-bg($background);
|
@include gradient-bg($background);
|
||||||
border-color: $border;
|
border-color: $border;
|
||||||
@include box-shadow($btn-box-shadow);
|
@include box-shadow($btn-box-shadow);
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: color-yiq($hover-background);
|
color: $hover-color;
|
||||||
@include gradient-bg($hover-background);
|
@include gradient-bg($hover-background);
|
||||||
border-color: $hover-border;
|
border-color: $hover-border;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:focus,
|
&:focus,
|
||||||
&.focus {
|
&.focus {
|
||||||
color: color-yiq($hover-background);
|
color: $hover-color;
|
||||||
@include gradient-bg($hover-background);
|
@include gradient-bg($hover-background);
|
||||||
border-color: $hover-border;
|
border-color: $hover-border;
|
||||||
// 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: $btn-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);
|
box-shadow: $btn-box-shadow, 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);
|
||||||
} @else {
|
} @else {
|
||||||
box-shadow: 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);
|
box-shadow: 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disabled comes first so active can properly restyle
|
// Disabled comes first so active can properly restyle
|
||||||
&.disabled,
|
&.disabled,
|
||||||
&:disabled {
|
&:disabled {
|
||||||
color: color-yiq($background);
|
color: $color;
|
||||||
background-color: $background;
|
background-color: $background;
|
||||||
border-color: $border;
|
border-color: $border;
|
||||||
// Remove CSS gradients if they're enabled
|
// Remove CSS gradients if they're enabled
|
||||||
@ -43,7 +53,7 @@
|
|||||||
&:not(:disabled):not(.disabled):active,
|
&:not(:disabled):not(.disabled):active,
|
||||||
&:not(:disabled):not(.disabled).active,
|
&:not(:disabled):not(.disabled).active,
|
||||||
.show > &.dropdown-toggle {
|
.show > &.dropdown-toggle {
|
||||||
color: color-yiq($active-background);
|
color: $active-color;
|
||||||
background-color: $active-background;
|
background-color: $active-background;
|
||||||
@if $enable-gradients {
|
@if $enable-gradients {
|
||||||
background-image: none; // Remove the gradient for the pressed/active state
|
background-image: none; // Remove the gradient for the pressed/active state
|
||||||
@ -53,15 +63,21 @@
|
|||||||
&:focus {
|
&:focus {
|
||||||
// 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 and $btn-active-box-shadow != none {
|
@if $enable-shadows and $btn-active-box-shadow != none {
|
||||||
box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);
|
box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);
|
||||||
} @else {
|
} @else {
|
||||||
box-shadow: 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);
|
box-shadow: 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin button-outline-variant($color, $color-hover: color-yiq($color), $active-background: $color, $active-border: $color) {
|
@mixin button-outline-variant(
|
||||||
|
$color,
|
||||||
|
$color-hover: color-yiq($color),
|
||||||
|
$active-background: $color,
|
||||||
|
$active-border: $color,
|
||||||
|
$active-color: color-yiq($active-background)
|
||||||
|
) {
|
||||||
color: $color;
|
color: $color;
|
||||||
border-color: $color;
|
border-color: $color;
|
||||||
|
|
||||||
@ -85,7 +101,7 @@
|
|||||||
&:not(:disabled):not(.disabled):active,
|
&:not(:disabled):not(.disabled):active,
|
||||||
&:not(:disabled):not(.disabled).active,
|
&:not(:disabled):not(.disabled).active,
|
||||||
.show > &.dropdown-toggle {
|
.show > &.dropdown-toggle {
|
||||||
color: color-yiq($active-background);
|
color: $active-color;
|
||||||
background-color: $active-background;
|
background-color: $active-background;
|
||||||
border-color: $active-border;
|
border-color: $active-border;
|
||||||
|
|
||||||
|
@ -37,6 +37,8 @@ Changes to our source Sass files and compiled CSS.
|
|||||||
- Dropped `color()`, `theme-color()` & `gray()` functions in favor of variables. [See #29083](https://github.com/twbs/bootstrap/pull/29083)
|
- Dropped `color()`, `theme-color()` & `gray()` functions in favor of variables. [See #29083](https://github.com/twbs/bootstrap/pull/29083)
|
||||||
- The `theme-color-level()` function is renamed to `color-level()` and now accepts any color you want instead of only `$theme-color` colors. [See #29083](https://github.com/twbs/bootstrap/pull/29083)
|
- The `theme-color-level()` function is renamed to `color-level()` and now accepts any color you want instead of only `$theme-color` colors. [See #29083](https://github.com/twbs/bootstrap/pull/29083)
|
||||||
- Line heights are dropped from several components to simplify our codebase. The `button-size()` and `pagination-size()` do not accept line height parameters anymore. [See #29271](https://github.com/twbs/bootstrap/pull/29271)
|
- Line heights are dropped from several components to simplify our codebase. The `button-size()` and `pagination-size()` do not accept line height parameters anymore. [See #29271](https://github.com/twbs/bootstrap/pull/29271)
|
||||||
|
- The `button-variant()` mixin now accepts 3 optional color parameters, for each button state, to override the color provided by `color-yiq()`. By default, these parameters will find which color provides more contrast against the button state's background color with `color-yiq()`.
|
||||||
|
- The `button-outline-variant()` mixin now accepts an additional argument, `$active-color`, for setting the button's active state text color. By default, this parameter will find which color provides more contrast against the button's active background color with `color-yiq()`.
|
||||||
|
|
||||||
## JavaScript
|
## JavaScript
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user