Skip to content

Commit

Permalink
Merge component variables
Browse files Browse the repository at this point in the history
  • Loading branch information
colebemis committed May 26, 2021
1 parent 1f98487 commit 013c6fa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion data/colors_v2/themes/dark.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {merge} from '../../../src/utils'
import darkComponentVars from '../vars/component_dark'
import deprecatedVars from '../vars/deprecated'
import darkGlobalVars from '../vars/global_dark'
import darkMarketingVars from '../vars/marketing_dark'
Expand Down Expand Up @@ -50,4 +51,4 @@ const scale = {
pink: ['#ffdaec', '#ffbedd', '#ff9bce', '#f778ba', '#db61a2', '#bf4b8a', '#9e3670', '#7d2457', '#5e103e', '#42062a']
}

export default merge(deprecatedVars, darkProductVars, darkMarketingVars, darkGlobalVars, {scale})
export default merge(deprecatedVars, darkProductVars, darkMarketingVars, darkComponentVars, darkGlobalVars, {scale})
3 changes: 2 additions & 1 deletion data/colors_v2/themes/light.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {merge} from '../../../src/utils'
import lightComponentVars from '../vars/component_light'
import deprecatedVars from '../vars/deprecated'
import lightGlobalVars from '../vars/global_light'
import lightMarketingVars from '../vars/marketing_light'
Expand Down Expand Up @@ -50,4 +51,4 @@ const scale = {
pink: ['#ffeff7', '#ffd3eb', '#ffadda', '#ff80c8', '#e85aad', '#bf3989', '#99286e', '#772057', '#611347', '#4d0336']
}

export default merge(deprecatedVars, lightProductVars, lightMarketingVars, lightGlobalVars, {scale})
export default merge(deprecatedVars, lightProductVars, lightMarketingVars, lightComponentVars, lightGlobalVars, {scale})

0 comments on commit 013c6fa

Please sign in to comment.