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

fix(Dropdown): fixes based on design audit #10886

Merged
merged 4 commits into from
Mar 4, 2022
Merged

fix(Dropdown): fixes based on design audit #10886

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6d7bd2
fix(Dropdown): fixes based on design audit
tw15egan Mar 1, 2022
ba43e72
fix(ComboBox): update field tokens)
tw15egan Mar 1, 2022
f0cb7ba
fix(ListBox): change input from layer to field
tw15egan Mar 2, 2022
72e5c85
Merge branch 'main' into dropdown-audit-fixes
kodiakhq[bot] Mar 4, 2022
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
2 changes: 1 addition & 1 deletion packages/styles/scss/components/combo-box/_combo-box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

// V11: Possibly deprecate
.#{$prefix}--combo-box.#{$prefix}--list-box--light:hover {
background-color: $field-02;
background-color: $field;
}

.#{$prefix}--combo-box .#{$prefix}--text-input::-ms-clear {
Expand Down
14 changes: 7 additions & 7 deletions packages/styles/scss/components/dropdown/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@

// V11: Possibly deprecate
.#{$prefix}--dropdown--light {
background-color: $field-02;
background-color: $field;

&:hover {
background-color: $layer-hover-02;
background-color: $field-hover;
}
}

Expand Down Expand Up @@ -202,7 +202,7 @@

// V11: Possibly deprecate
.#{$prefix}--dropdown--light .#{$prefix}--dropdown-list {
background-color: $field-02;
background-color: $layer;
}

.#{$prefix}--dropdown:not(.#{$prefix}--dropdown--open)
Expand Down Expand Up @@ -354,7 +354,7 @@

// V11: Possibly deprecate
&.#{$prefix}--dropdown--light:hover {
background-color: $field-02;
background-color: $field;
}
}

Expand All @@ -377,7 +377,7 @@
transition: background $duration-fast-01 motion(entrance, productive);

&:hover {
background-color: $field-hover;
background-color: $layer-hover;
}

&.#{$prefix}--dropdown--disabled {
Expand Down Expand Up @@ -433,11 +433,11 @@

.#{$prefix}--dropdown--show-selected .#{$prefix}--dropdown--selected {
display: block;
background-color: $layer-hover;
background-color: $layer-selected;
color: $text-primary;

&:hover {
background-color: $layer-selected;
background-color: $layer-selected-hover;
}

.#{$prefix}--dropdown-link {
Expand Down
13 changes: 6 additions & 7 deletions packages/styles/scss/components/list-box/_list-box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ $list-box-menu-width: rem(300px);
background-color: $field;

&:hover {
background-color: $layer-hover;
background-color: $field-hover;
}
}

// V11: Possibly deprecate
.#{$prefix}--list-box--light .#{$prefix}--list-box__menu {
background: $field;
background: $layer;
}

// V11: Possibly deprecate
Expand Down Expand Up @@ -237,7 +237,7 @@ $list-box-menu-width: rem(300px);
background-color: transparent;

&:hover {
background-color: $field-hover;
background-color: $layer-hover;
}
}

Expand Down Expand Up @@ -477,7 +477,7 @@ $list-box-menu-width: rem(300px);
}

.#{$prefix}--list-box--disabled .#{$prefix}--list-box__selection--multi {
@include tag-theme($text-disabled, $field);
@include tag-theme($text-disabled, $layer);

> svg {
fill: $icon-disabled;
Expand Down Expand Up @@ -701,7 +701,7 @@ $list-box-menu-width: rem(300px);

.#{$prefix}--list-box__menu-item--highlighted {
border-color: transparent;
background-color: $layer-hover;
background-color: $layer-selected;
color: $text-primary;
}

Expand Down Expand Up @@ -730,8 +730,7 @@ $list-box-menu-width: rem(300px);
background-color: $layer-selected;
}

.#{$prefix}--list-box__menu-item--active:hover,
.#{$prefix}--list-box__menu-item--active.#{$prefix}--list-box__menu-item--highlighted {
.#{$prefix}--list-box__menu-item--active:hover {
border-bottom-color: $layer-selected-hover;
background-color: $layer-selected-hover;
}
Expand Down