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

[v4] [core] feat: update checkbox and radio colors #5056

Merged
merged 1 commit into from
Dec 3, 2021
Merged

[v4] [core] feat: update checkbox and radio colors #5056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 1 addition & 39 deletions packages/core/src/blueprint.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ $dark-minimal-button-intents-modern: (
"warning": (rgba($orange3, 0.2), $orange5, rgba($orange3, 0.3), $orange6),
"danger": (rgba($red3, 0.2), $red5, rgba($red3, 0.3), $red6)
);
$minimal-button-background-color-hover: rgba($gray3, 0.15);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

made these overrides the defaults

$minimal-button-background-color-active: rgba($gray3, 0.3);

// Checkbox and Radio variable overrides
$dark-control-background-color: $gray4;
$dark-control-background-color-hover: $gray3;
$dark-control-background-color-active: linear-gradient(0deg, rgba($white, 0.1), rgba($white, 0.1)),
linear-gradient(0deg, $gray2, $gray2);

// Editable text variable overrides
$input-placeholder-color: $gray1;
Expand Down Expand Up @@ -237,37 +229,7 @@ $tree-intent-icon-colors-modern: (
}
}

// Contrast for checkboxes and radio buttons
.#{$ns}-control {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed most of these except for

    input:focus ~ .#{$ns}-control-indicator {
      outline: $blue5 auto 2px;
    }

input:focus ~ .#{$ns}-control-indicator {
outline: $blue3 auto 2px;
}

&.#{$ns}-checkbox, &.#{$ns}-radio {
.#{$ns}-control-indicator {
box-shadow:
inset 0 0 0 $button-border-width rgba($black, 0.5),
inset 0 (-$button-border-width) 0 rgba($black, 0.1);
}
}

.#{$ns}-dark & {
input:focus ~ .#{$ns}-control-indicator {
outline: $blue5 auto 2px;
}

&.#{$ns}-checkbox, &.#{$ns}-radio {
input:not(:disabled):not(:checked) ~ .#{$ns}-control-indicator {
box-shadow: $dark-button-box-shadow-active;
}

input:not(:disabled):active:checked ~ .#{$ns}-control-indicator {
background: linear-gradient(180deg, rgba($white, 0.1) 0%, rgba($white, 0) 100%),
linear-gradient(0deg, $blue1, $blue1);
}
}
}
}
// Contrast for checkboxes and radio buttons - no overrides necessary, modern colors are now built-in

// Contrast for HTML tables
table.#{$ns}-html-table {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/components/button/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ $dark-button-intent-color-disabled: rgba($white, 0.3);

$minimal-button-divider-width: 1px !default;
$minimal-button-background-color: none !default;
$minimal-button-background-color-hover: rgba($gray4, 0.3) !default;
$minimal-button-background-color-active: rgba($gray2, 0.3) !default;
$minimal-button-background-color-hover: rgba($gray3, 0.15) !default;
$minimal-button-background-color-active: rgba($gray3, 0.3) !default;
$dark-minimal-button-background-color: none !default;
$dark-minimal-button-background-color-hover: rgba($gray3, 0.15) !default;
$dark-minimal-button-background-color-active: rgba($gray3, 0.3) !default;
Expand Down
55 changes: 34 additions & 21 deletions packages/core/src/components/forms/_controls.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,24 @@
@import "../../common/variables";
@import "../button/common";

$control-background-color: $button-background-color !default;
$control-background-color-hover: $button-background-color-hover !default;
$control-background-color-active: $button-background-color-active !default;
$dark-control-background-color: $dark-button-background-color !default;
$dark-control-background-color-hover: $dark-button-background-color-hover !default;
$dark-control-background-color-active: $dark-button-background-color-active !default;
$control-background-color: transparent !default;
$control-background-color-hover: $minimal-button-background-color-hover !default;
$control-background-color-active: $minimal-button-background-color-active !default;
$control-background-color-disabled: $minimal-button-background-color-hover !default;
$dark-control-background-color: transparent !default;
$dark-control-background-color-hover: $minimal-button-background-color-hover !default;
$dark-control-background-color-active: $minimal-button-background-color-active !default;
$dark-control-background-color-disabled: $minimal-button-background-color-hover !default;

$control-checked-background-color: nth(map-get($button-intents, "primary"), 1) !default;
$control-checked-background-color-hover: nth(map-get($button-intents, "primary"), 2) !default;
$control-checked-background-color-active: nth(map-get($button-intents, "primary"), 3) !default;
$control-checked-background-color-disabled: rgba($control-checked-background-color, 0.5) !default;

$control-box-shadow: inset 0 0 0 $button-border-width $gray2 !default;
$control-checked-box-shadow: inset 0 0 0 $button-border-width rgba($black, 0.2) !default;
$dark-control-box-shadow: inset 0 0 0 $button-border-width $gray3 !default;
$dark-control-checked-box-shadow: inset 0 0 0 $button-border-width rgba($white, 0.1) !default;

$control-indicator-size: $pt-icon-size-standard !default;
$control-indicator-size-large: $pt-icon-size-large !default;
Expand All @@ -24,43 +32,43 @@ $control-indicator-spacing: $pt-grid-size !default;
input#{$selector} ~ .#{$ns}-control-indicator {
background-color: $control-checked-background-color;
background-image: $button-intent-gradient;
box-shadow: $button-intent-box-shadow;
box-shadow: $control-checked-box-shadow;
color: $white;
}

&:hover input#{$selector} ~ .#{$ns}-control-indicator {
background-color: $control-checked-background-color-hover;
box-shadow: $button-intent-box-shadow;
}

input:not(:disabled):active#{$selector} ~ .#{$ns}-control-indicator {
background: $control-checked-background-color-active;
box-shadow: $button-intent-box-shadow-active;
}

input:disabled#{$selector} ~ .#{$ns}-control-indicator {
background: rgba($control-checked-background-color, 0.5);
background: $control-checked-background-color-disabled;
box-shadow: none;
color: rgba($white, 0.6);
}

.#{$ns}-dark & {
input#{$selector} ~ .#{$ns}-control-indicator {
box-shadow: $dark-button-intent-box-shadow;
box-shadow: $dark-control-checked-box-shadow;
}

&:hover input#{$selector} ~ .#{$ns}-control-indicator {
background-color: $control-checked-background-color-hover;
box-shadow: $dark-button-intent-box-shadow;
box-shadow: $dark-control-checked-box-shadow;
}

input:not(:disabled):active#{$selector} ~ .#{$ns}-control-indicator {
background-color: $control-checked-background-color-active;
box-shadow: $dark-button-intent-box-shadow-active;
box-shadow: $dark-control-checked-box-shadow;
}

input:disabled#{$selector} ~ .#{$ns}-control-indicator {
background: rgba($control-checked-background-color-active, 0.5);
background: $control-checked-background-color-disabled;
box-shadow: none;
color: rgba($white, 0.6);
}
}
}
Expand Down Expand Up @@ -118,7 +126,7 @@ $control-indicator-spacing: $pt-grid-size !default;
background-color: $control-background-color;
background-image: $button-gradient;
border: none;
box-shadow: $button-box-shadow;
box-shadow: $control-box-shadow;
cursor: pointer;
display: inline-block;
// font-size is used to size indicator for all control types,
Expand Down Expand Up @@ -146,17 +154,18 @@ $control-indicator-spacing: $pt-grid-size !default;

input:not(:disabled):active ~ .#{$ns}-control-indicator {
background: $control-background-color-active;
box-shadow: $button-box-shadow-active;
box-shadow: $control-box-shadow;
}

input:disabled ~ .#{$ns}-control-indicator {
background: $button-background-color-disabled;
background: $control-background-color-disabled;
box-shadow: none;
cursor: not-allowed;
}

input:focus ~ .#{$ns}-control-indicator {
@include focus-outline();
outline: $blue3 auto 2px;
}

// right-aligned indicator is glued to the right side of the container
Expand Down Expand Up @@ -468,20 +477,24 @@ $control-indicator-spacing: $pt-grid-size !default;
.#{$ns}-control-indicator {
background-color: $dark-control-background-color;
background-image: $dark-button-gradient;
box-shadow: $dark-button-box-shadow;
box-shadow: $dark-control-box-shadow;
}

&:hover .#{$ns}-control-indicator {
background-color: $dark-control-background-color-hover;
}

input:focus ~ .#{$ns}-control-indicator {
outline: $blue5 auto 2px;
}

input:not(:disabled):active ~ .#{$ns}-control-indicator {
background: $dark-control-background-color-active;
box-shadow: $dark-button-box-shadow-active;
box-shadow: $dark-control-box-shadow;
}

input:disabled ~ .#{$ns}-control-indicator {
background: $dark-button-background-color-disabled;
background: $dark-control-background-color-disabled;
box-shadow: none;
cursor: not-allowed;
}
Expand All @@ -490,7 +503,7 @@ $control-indicator-spacing: $pt-grid-size !default;
&:checked,
&:indeterminate {
~ .#{$ns}-control-indicator {
color: $dark-button-color-disabled;
background: $control-checked-background-color-disabled;
}
}
}
Expand Down