Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ export const useBandsChartPalette = (): BandsChartPalette => {
borderColor: theme.design.Layer[1].Outline,
userRangeHighlightColor: theme.design.Chart.LiquidationZone.Current,
userRangeTopLabelBackgroundColor: theme.design.Chart.Candles.Negative,
userRangeTopLabelTextColor: theme.design.Text.TextColors.FilledFeedback.Alert.Primary,
userRangeBottomLabelBackgroundColor: theme.design.Chart.Lines.Line2,
userRangeBottomLabelTextColor: theme.design.Text.TextColors.FilledFeedback.Warning.Primary,
oraclePriceLineColor: theme.design.Color.Primary[500],
liquidationBandOutlineColor: theme.design.Color.Tertiary[600],
zoomTrackBackgroundColor: theme.design.Color.Primary[200],
Expand Down
4 changes: 2 additions & 2 deletions apps/main/src/llamalend/features/bands-chart/markLines.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ export const createLabelStyle = (lineStyle: { color: string }, palette: BandsCha
: palette.userRangeBottomLabelBackgroundColor,
color:
lineStyle.color === palette.oraclePriceLineColor || lineStyle.color === palette.userRangeTopLabelBackgroundColor
? palette.textColorInverted
: palette.textColor,
? palette.userRangeTopLabelTextColor
: palette.userRangeBottomLabelTextColor,
})

/**
Expand Down
2 changes: 2 additions & 0 deletions apps/main/src/llamalend/features/bands-chart/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ export type BandsChartPalette = {
borderColor: string
userRangeHighlightColor: string
userRangeTopLabelBackgroundColor: string
userRangeTopLabelTextColor: string
userRangeBottomLabelBackgroundColor: string
userRangeBottomLabelTextColor: string
oraclePriceLineColor: string
liquidationBandOutlineColor: string
zoomTrackBackgroundColor: string
Expand Down
2 changes: 1 addition & 1 deletion packages/curve-ui-kit/src/shared/ui/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const TooltipContent = ({ title, children }: { title: ReactNode; children
// cancel any theme inversion as it's often applied on hover
<InvertTheme inverted={false}>
<Box
sx={{ padding: Spacing.md, backgroundColor: (t) => t.design.Layer[3].Fill, width: '100%' }}
sx={{ padding: Spacing.md, backgroundColor: (t) => t.design.Layer[1].Fill, width: '100%' }}
onClick={(e) => e.stopPropagation()} // prevent changing pages when clicking on the tooltip
>
<Typography variant="bodyMBold" color="textPrimary" component="div">
Expand Down
2 changes: 1 addition & 1 deletion packages/curve-ui-kit/src/themes/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export const createComponents = (
},
styleOverrides: {
paper: {
backgroundColor: design.Layer[3].Fill,
backgroundColor: design.Layer[2].Fill,
'& .MuiMenu-list': {
maxHeight: SizesAndSpaces.MaxHeight.popover,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const defineMuiInputBase = (
): Components['MuiInputBase'] => ({
styleOverrides: {
root: {
backgroundColor: Base.Default.Fill,
backgroundColor: Base.Default.Fill.Default,
// color the whole input base when accepting autofill suggestions in Chromium browsers
':has(input:autofill)': {
backgroundColor: 'light-dark(rgb(232, 240, 254), rgba(70, 90, 126, 0.4))',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const tabStyle = ({ Label, Fill, Outline }: TabStyle, inset?: string) => ({
color: Label,
backgroundColor: Fill,
'::after': {
backgroundColor: Outline ?? 'transparant',
backgroundColor: Outline ?? 'transparent',
inset,
},
})
Expand Down
38 changes: 22 additions & 16 deletions packages/curve-ui-kit/src/themes/design/0_primitives.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,6 @@ export const Blues = {
'950': '#171e55',
} as const

export const Yellows = {
'50': '#fff9e6',
'100': '#fff9f0',
'200': '#fff1db',
'300': '#ffe6bd',
'400': '#ffd88b',
'500': '#ffc300',
'600': '#e0ab00',
'700': '#c19300',
'800': '#a37c0c',
'900': '#84671d',
'950': '#665223',
} as const

export const Oranges = {
'50': '#f0ddd1',
'100': '#f3cfb9',
Expand All @@ -82,6 +68,20 @@ export const Oranges = {
'950': '#4e2708',
} as const

export const Yellows = {
'50': '#fffbf5',
'100': '#fff9f0',
'200': '#fff1db',
'300': '#ffe6bd',
'400': '#ffd88b',
'500': '#ffc300',
'600': '#e0ab00',
'700': '#c19300',
'800': '#a37c0c',
'900': '#84671d',
'950': '#665223',
} as const

export const Violets = {
'50': '#efedfc',
'100': '#dbd9f7',
Expand All @@ -96,20 +96,26 @@ export const Violets = {
'950': '#2f2862',
} as const

export const Transparent = '#ffffff00' as const

export const Spacing = {
'50': '0',
'50': '0rem',
'75': '0.062rem', // ~1px
'100': '0.125rem', // 2px
'200': '0.25rem', // 4px
'300': '0.5rem', // 8px
'350': '0.875rem', // 14px
'400': '1rem', // 16px
'450': '1.25rem', // 20px
'500': '1.5rem', // 24px
'600': '2rem', // 32px
'700': '3rem', // 48px
'800': '4rem', // 64px
} as const

export const Sizing = {
'10': '0.062rem', // ~1px
'25': '0.125rem', // 2px
'50': '0.25rem', // 4px
'100': '0.5rem', // 8px
'125': '0.75rem', // 12px
Expand All @@ -119,7 +125,7 @@ export const Sizing = {
'300': '1.5rem', // 24px
'350': '1.75rem', // 28px
'400': '2rem', // 32px
'450': '2.25rem', // 36px
'450': '2.25rem',
'500': '2.5rem', // 40px
'600': '3rem', // 48px
'650': '3.5rem', // 56px
Expand Down
Loading
Loading