mirror of
https://github.com/vercel/commerce.git
synced 2025-07-22 20:26:49 +00:00
🔀 merge:Merge branch 'common' of github.com:KieIO/grocery-vercel-commerce into m2-datnguyen
:%s
This commit is contained in:
@@ -45,6 +45,7 @@ module.exports = {
|
||||
'negative-border-line': 'var(--negative-border-line)',
|
||||
'negative-light': 'var(--negative-light)',
|
||||
|
||||
<<<<<<< HEAD
|
||||
'line': 'var(--border-line)',
|
||||
'background': 'var(--background)',
|
||||
'white': 'var(--white)',
|
||||
@@ -53,12 +54,15 @@ module.exports = {
|
||||
|
||||
|
||||
'disabled': 'var(--text-disabled)',
|
||||
=======
|
||||
>>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
|
||||
line: 'var(--border-line)',
|
||||
background: 'var(--background)',
|
||||
white: 'var(--white)',
|
||||
'background-arrow':'var(--background-arrow)',
|
||||
gray: 'var(--gray)',
|
||||
disabled: 'var(--text-disabled)',
|
||||
'background-arrow':'var(--background-arrow)',
|
||||
|
||||
|
||||
// @deprecated (NOT use these variables)
|
||||
'primary-2': 'var(--primary-2)',
|
||||
|
Reference in New Issue
Block a user