Commit 6c908eb7 authored by Charles Bachmeier's avatar Charles Bachmeier Committed by GitHub

refactor: update card colors and rename backgroundAction (#4725)

update card colors and rename backgroundAction
Co-authored-by: default avatarCharles Bachmeier <charlie@genie.xyz>
parent dc15144a
...@@ -6,7 +6,7 @@ export const bagQuantity = style([ ...@@ -6,7 +6,7 @@ export const bagQuantity = style([
position: 'absolute', position: 'absolute',
top: '4', top: '4',
right: '4', right: '4',
backgroundColor: 'backgroundAction', backgroundColor: 'accentAction',
borderRadius: 'round', borderRadius: 'round',
color: 'explicitWhite', color: 'explicitWhite',
textAlign: 'center', textAlign: 'center',
......
...@@ -117,7 +117,7 @@ export const erc1155PlusButton = style([ ...@@ -117,7 +117,7 @@ export const erc1155PlusButton = style([
}), }),
{ {
':hover': { ':hover': {
backgroundColor: themeVars.colors.backgroundAction, backgroundColor: themeVars.colors.accentAction,
color: themeVars.colors.textPrimary, color: themeVars.colors.textPrimary,
}, },
}, },
......
...@@ -13,7 +13,7 @@ import { ...@@ -13,7 +13,7 @@ import {
SuspiciousIcon20, SuspiciousIcon20,
} from 'nft/components/icons' } from 'nft/components/icons'
import { body, subheadSmall } from 'nft/css/common.css' import { body, subheadSmall } from 'nft/css/common.css'
import { themeVars, vars } from 'nft/css/sprinkles.css' import { themeVars } from 'nft/css/sprinkles.css'
import { useIsMobile } from 'nft/hooks' import { useIsMobile } from 'nft/hooks'
import { GenieAsset, Rarity, UniformHeight, UniformHeights } from 'nft/types' import { GenieAsset, Rarity, UniformHeight, UniformHeights } from 'nft/types'
import { fallbackProvider, putCommas } from 'nft/utils' import { fallbackProvider, putCommas } from 'nft/utils'
...@@ -456,19 +456,21 @@ const Button = ({ children, quantity, selectedChildren, onClick, onSelectedClick ...@@ -456,19 +456,21 @@ const Button = ({ children, quantity, selectedChildren, onClick, onSelectedClick
? 'accentFailure' ? 'accentFailure'
: asset.notForSale : asset.notForSale
? 'textTertiary' ? 'textTertiary'
: 'blue400' : 'accentAction'
} }
style={{ background={
background: `${ buttonHovered || isMobile
buttonHovered || isMobile ? asset.notForSale
? selected ? 'backgroundInteractive'
? vars.color.accentFailure
: vars.color.blue400
: selected : selected
? '#FA2B391F' ? 'accentFailure'
: '#4C82FB1F' : 'accentAction'
}`, : asset.notForSale
}} ? 'backgroundModule'
: selected
? 'accentFailureSoft'
: 'accentActionSoft'
}
className={clsx(styles.button, subheadSmall)} className={clsx(styles.button, subheadSmall)}
onClick={(e) => onClick={(e) =>
selected selected
......
...@@ -4,6 +4,8 @@ import { createSprinkles, defineProperties } from '@vanilla-extract/sprinkles' ...@@ -4,6 +4,8 @@ import { createSprinkles, defineProperties } from '@vanilla-extract/sprinkles'
const themeContractValues = { const themeContractValues = {
colors: { colors: {
accentFailure: '', accentFailure: '',
accentFailureSoft: '',
accentAction: '',
accentActionSoft: '', accentActionSoft: '',
explicitWhite: '', explicitWhite: '',
...@@ -11,7 +13,6 @@ const themeContractValues = { ...@@ -11,7 +13,6 @@ const themeContractValues = {
green: '', green: '',
violet: '', violet: '',
backgroundAction: '',
backgroundFloating: '', backgroundFloating: '',
backgroundInteractive: '', backgroundInteractive: '',
backgroundModule: '', backgroundModule: '',
...@@ -177,7 +178,6 @@ export const vars = createGlobalTheme(':root', { ...@@ -177,7 +178,6 @@ export const vars = createGlobalTheme(':root', {
grey200: '#B7BED4', grey200: '#B7BED4',
grey100: '#DDE3F7', grey100: '#DDE3F7',
grey50: '#EDEFF7', grey50: '#EDEFF7',
accentActionSoft: 'rgba(76, 130, 251, 0.24)',
accentTextLightTertiary: 'rgba(255, 255, 255, 0.12)', accentTextLightTertiary: 'rgba(255, 255, 255, 0.12)',
outline: 'rgba(153, 161, 189, 0.24)', outline: 'rgba(153, 161, 189, 0.24)',
lightGrayOverlay: '#99A1BD14', lightGrayOverlay: '#99A1BD14',
......
...@@ -3,6 +3,8 @@ import { Theme, vars } from 'nft/css/sprinkles.css' ...@@ -3,6 +3,8 @@ import { Theme, vars } from 'nft/css/sprinkles.css'
export const darkTheme: Theme = { export const darkTheme: Theme = {
colors: { colors: {
accentFailure: vars.color.red300, accentFailure: vars.color.red300,
accentFailureSoft: 'rgba(253, 118, 107, 0.12)',
accentAction: vars.color.blue400,
accentActionSoft: '#000000E5', accentActionSoft: '#000000E5',
explicitWhite: '#FFFFFF', explicitWhite: '#FFFFFF',
...@@ -10,7 +12,6 @@ export const darkTheme: Theme = { ...@@ -10,7 +12,6 @@ export const darkTheme: Theme = {
gold: vars.color.gold200, gold: vars.color.gold200,
violet: vars.color.violet200, violet: vars.color.violet200,
backgroundAction: vars.color.blue400,
backgroundFloating: '0000000C', backgroundFloating: '0000000C',
backgroundInteractive: vars.color.grey700, backgroundInteractive: vars.color.grey700,
backgroundModule: vars.color.grey800, backgroundModule: vars.color.grey800,
......
...@@ -3,11 +3,12 @@ import { Theme, vars } from 'nft/css/sprinkles.css' ...@@ -3,11 +3,12 @@ import { Theme, vars } from 'nft/css/sprinkles.css'
export const lightTheme: Theme = { export const lightTheme: Theme = {
colors: { colors: {
accentFailure: vars.color.red400, accentFailure: vars.color.red400,
accentActionSoft: '#FFFFFFE5', accentFailureSoft: 'rgba(250, 43, 57, 0.12)',
accentAction: vars.color.pink400,
accentActionSoft: 'rgba(251, 17, 142, 0.12)',
explicitWhite: '#FFFFFF', explicitWhite: '#FFFFFF',
backgroundAction: vars.color.pink400,
backgroundFloating: '#00000000', backgroundFloating: '#00000000',
backgroundInteractive: vars.color.grey100, backgroundInteractive: vars.color.grey100,
backgroundModule: vars.color.grey50, backgroundModule: vars.color.grey50,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment