Skip to content

Clean up badgeColors and avatarColors from the v5 and default themes #972

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

Merged
akleiner2 merged 5 commits into from
Sep 4, 2020
Merged

Clean up badgeColors and avatarColors from the v5 and default themes #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2cf8e7
Clean up `badgeColors` and `avatarColors` from the v5 and default themes
akleiner2 Sep 3, 2020
3743b68
revert prettier changes
akleiner2 Sep 3, 2020
11fe672
more updates
akleiner2 Sep 3, 2020
da3f556
Merge branch 'v6' into rm-badge-and-avatar-colors
akleiner2 Sep 3, 2020
ed243ff
updates
akleiner2 Sep 4, 2020
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
4 changes: 2 additions & 2 deletions src/badges/stories/index.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ storiesOf('badges', module)
<ThemeConsumer>
{theme => (
<Box style={{ ...wrapperStyles }}>
{theme.badgeColors.map(color => (
{Object.keys(theme.tokens.fills).map(color => (
<Box key={color}>
<Badge color={color} {...baseStyles}>
{color}
Expand All @@ -47,7 +47,7 @@ storiesOf('badges', module)
<ThemeConsumer>
{theme => (
<Box style={{ ...wrapperStyles }}>
{theme.badgeColors.map((color, index) => {
{Object.keys(theme.tokens.fills).map((color, index) => {
return (
<Box
key={color}
Expand Down
5 changes: 0 additions & 5 deletions src/theme/src/themes/default/component-specific/avatarColors.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/theme/src/themes/default/component-specific/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// Simple Properties.
export { default as overlayBackgroundColor } from './overlayBackgroundColor'
export { default as avatarColors } from './avatarColors'
export { default as badgeColors } from './badgeColors'
export { default as spinnerColor } from './spinnerColor'

export { default as getTextDropdownButtonClassName } from './getTextDropdownButtonClassName'
Expand Down
9 changes: 1 addition & 8 deletions src/theme/src/themes/default/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ import { headings, text, fontFamilies, paragraph } from './typography'
* These ARE REQUIRED for Evergreen to work.
*/
import {
avatarColors,
badgeColors,
getTextDropdownButtonClassName,
getTableCellClassName,
getRowClassName,
Expand All @@ -52,7 +50,7 @@ import {
* ---
* These ARE REQUIRED for Evergreen to work.
*/
import { getIconSizeForIconButton, getElevation } from './theme-helpers'
import { getElevation } from './theme-helpers'

export default {
// Foundational Styles.
Expand All @@ -63,17 +61,12 @@ export default {
scales,
tokens,

// Component Specific.
avatarColors,
badgeColors,
getTextDropdownButtonClassName,
getTableCellClassName,
getRowClassName,
getMenuItemClassName,
getCodeProps,

// Theme Helpers.
getIconSizeForIconButton,
getElevation,

inputs,
Expand Down
5 changes: 0 additions & 5 deletions src/theme/src/themes/v5/component-specific/avatarColors.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/theme/src/themes/v5/component-specific/badgeColors.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/theme/src/themes/v5/component-specific/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// Simple Properties.
export { default as overlayBackgroundColor } from './overlayBackgroundColor'
export { default as avatarColors } from './avatarColors'
export { default as badgeColors } from './badgeColors'
export { default as spinnerColor } from './spinnerColor'

// Class Name Getters.
Expand Down
9 changes: 2 additions & 7 deletions src/theme/src/themes/v5/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ import { headings, text, fontFamilies, paragraph } from './typography'
* These ARE REQUIRED for Evergreen to work.
*/
import {
avatarColors,
badgeColors,
getTextDropdownButtonClassName,
getTableCellClassName,
getRowClassName,
Expand All @@ -54,7 +52,7 @@ import {
* ---
* These ARE REQUIRED for Evergreen to work.
*/
import { getIconSizeForIconButton, getElevation } from './theme-helpers'
import { getElevation } from './theme-helpers'

export default {
// Foundational Styles.
Expand All @@ -65,17 +63,14 @@ export default {
scales,
tokens,

// Component Specific.
avatarColors,
badgeColors,
getTextDropdownButtonClassName,
getTableCellClassName,
getRowClassName,
getMenuItemClassName,
getCodeProps,

// Theme Helpers.
getIconSizeForIconButton,

getElevation,

// Component-specific
Expand Down