Skip to content

Commit

Permalink
feat(tokens): add decorative-01, update dropdown styles (#5688)
Browse files Browse the repository at this point in the history
* feat(tokens): add decorative-01, update dropdown styles

* feat(tokens): add token to v9 theme
  • Loading branch information
tw15egan committed Mar 25, 2020
1 parent d94e91f commit f92e56e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 0 deletions.
8 changes: 8 additions & 0 deletions packages/components/src/components/dropdown/_dropdown.scss
Expand Up @@ -182,6 +182,10 @@
overflow-y: auto;
}

.#{$prefix}--dropdown--light .#{$prefix}--dropdown-list {
background-color: $field-02;
}

.#{$prefix}--dropdown:not(.#{$prefix}--dropdown--open)
.#{$prefix}--dropdown-item {
visibility: hidden;
Expand Down Expand Up @@ -238,6 +242,10 @@
}
}

.#{$prefix}--dropdown--light .#{$prefix}--dropdown-link {
border-top-color: $decorative-01;
}

.#{$prefix}--dropdown--sm .#{$prefix}--dropdown-link {
padding-top: rem(7px);
padding-bottom: rem(7px);
Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/g10.js
Expand Up @@ -125,6 +125,8 @@ export const disabled03 = gray50;

export const highlight = blue20;

export const decorative01 = gray20;

export const skeleton01 = '#e5e5e5';
export const skeleton02 = gray30;

Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/g100.js
Expand Up @@ -124,6 +124,8 @@ export const disabled03 = gray50;

export const highlight = blue80;

export const decorative01 = gray70;

export const skeleton01 = '#353535';
export const skeleton02 = gray80;

Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/g90.js
Expand Up @@ -126,6 +126,8 @@ export const disabled03 = gray40;

export const highlight = blue70;

export const decorative01 = gray60;

export const skeleton01 = '#353535';
export const skeleton02 = gray70;

Expand Down
3 changes: 3 additions & 0 deletions packages/themes/src/tokens.js
Expand Up @@ -94,6 +94,8 @@ const colors = [

'highlight',

'decorative01',

'skeleton01',
'skeleton02',

Expand Down Expand Up @@ -225,6 +227,7 @@ export const unstable__meta = {
'inverseHoverUI',
'active01',
'hoverField',
'decorative01',
],
},
],
Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/v9.js
Expand Up @@ -89,6 +89,8 @@ export const disabled03 = '#cdd1d4';

export const highlight = '#f4f7fb';

export const decorative01 = '#EEF4FC';

export const skeleton01 = 'rgba(61, 112, 178, .1)';
export const skeleton02 = 'rgba(61, 112, 178, .1)';

Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/white.js
Expand Up @@ -125,6 +125,8 @@ export const disabled03 = gray50;

export const highlight = blue20;

export const decorative01 = gray20;

export const skeleton01 = '#e5e5e5';
export const skeleton02 = gray30;

Expand Down

0 comments on commit f92e56e

Please sign in to comment.