prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve merge conflict

Browse source
This commit is contained in:
Satindar Dhillon 2022-04-06 12:32:38 -07:00
parent 5ab64f3f64
commit dc028466d0
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/web/components/tokens/stitches.config.ts
View file

@ -102,7 +102,8 @@ export const { styled, css, theme, getCssText, globalCss, keyframes, config } =
borderStyles: {},
shadows: {
panelShadow: '0px 4px 18px rgba(120, 123, 134, 0.12)',
cardBoxShadow: '0px 0px 9px -2px rgba(32, 31, 29, 0.09), 0px 7px 12px rgba(32, 31, 29, 0.07)'
cardBoxShadow:
'0px 0px 9px -2px rgba(32, 31, 29, 0.09), 0px 7px 12px rgba(32, 31, 29, 0.07)',
},
zIndices: {},
transitions: {},
@ -146,7 +147,7 @@ export const { styled, css, theme, getCssText, globalCss, keyframes, config } =
// Avatar Fallback color
avatarBg: '#FFFFFF',
avatarFont: '#0A0806',
tooltipIcons: '#FDFAEC'
tooltipIcons: '#FDFAEC',
},
},
media: {
@ -193,13 +194,9 @@ const darkThemeSpec = {
avatarFont: 'rgba(255, 255, 255, 0.8)',
},
shadows: {
<<<<<<< HEAD
cardItemShadow: '0px 8px 32px rgba(255, 255, 255, 0.33)',
cardBoxShadow:
'0px 0px 9px -2px rgba(32, 31, 29, 0.09), 0px 7px 12px rgba(32, 31, 29, 0.07)',
},
=======
cardBoxShadow: '0px 0px 9px -2px rgba(32, 31, 29, 0.09), 0px 7px 12px rgba(32, 31, 29, 0.07)'
}
>>>>>>> main
}
// Avatar Fallback color