Skip to content

Commit

Permalink
fix(tokens): update tokens based on feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan committed Apr 14, 2021
1 parent 8c06edd commit 04a2c8f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,9 @@
tbody
tr:not(.#{$prefix}--parent-row):nth-child(even)
td {
// V11: Question for design: This currently maps to $ui-02
background-color: $data-table-zebra-color;
border-top: 1px solid $data-table-zebra-color;
border-bottom: 1px solid $data-table-zebra-color;
background-color: $layer-accent;
border-top: 1px solid $layer-accent;
border-bottom: 1px solid $layer-accent;
}

.#{$prefix}--data-table--zebra
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,9 @@

.#{$prefix}--data-table--zebra tbody tr[data-parent-row]:nth-child(4n + 1) td,
.#{$prefix}--data-table--zebra tbody tr[data-child-row]:nth-child(4n + 2) td {
// V11: Question for design: This currently maps to $ui-02
background-color: $data-table-zebra-color;
border-top: 1px solid $data-table-zebra-color;
border-bottom: 1px solid $data-table-zebra-color;
background-color: $layer-accent;
border-top: 1px solid $layer-accent;
border-bottom: 1px solid $layer-accent;
}

.#{$prefix}--data-table--zebra tr.#{$prefix}--parent-row td,
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/toggle/_toggle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
.#{$prefix}--toggle-input:active
+ .#{$prefix}--toggle-input__label
> .#{$prefix}--toggle__switch::before {
box-shadow: 0 0 0 1px $background, 0 0 0 3px $focus;
box-shadow: 0 0 0 1px $focus-inset, 0 0 0 3px $focus;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
Expand Down
3 changes: 1 addition & 2 deletions packages/components/src/components/ui-shell/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
/// @access private
/// @group ui-shell
@mixin carbon-content {
// V11: Need new token
.#{$prefix}--content {
padding: 2rem;
background: $ui-02;
background: $layer;
will-change: margin-left;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/components/src/globals/scss/_theme-tokens.scss
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,7 @@ $data-table-row-height: 2rem !default;
/// @type Color
/// @access public
/// @group data-table
// V11: We need a token for zebra styles
$data-table-zebra-color: $ui-02 !default;
$data-table-zebra-color: $layer-accent !default;

/// @type Color
/// @access public
Expand Down

0 comments on commit 04a2c8f

Please sign in to comment.