Skip to content

Commit 67d2137

Browse files
Merge branch 'main' into feat/pool-no-rpc
2 parents c814d44 + ff2ecd0 commit 67d2137

File tree

2 files changed

+8
-32
lines changed

2 files changed

+8
-32
lines changed

packages/curve-ui-kit/src/themes/design/2_theme.ts

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Blues, Grays, Greens, Reds, Violet, TransitionFunction } from './0_primitives'
1+
import { Blues, Grays, Greens, Reds, TransitionFunction, Violet } from './0_primitives'
22
import { SurfacesAndText } from './1_surfaces_text'
33

44
const { plain, inverted } = SurfacesAndText
@@ -148,13 +148,6 @@ export const createLightDesign = (Light: typeof plain.Light | typeof inverted.Li
148148
},
149149
} as const
150150

151-
const Feedback = {
152-
Success: Greens[300],
153-
Info: Layer[3].Fill,
154-
Warning: Reds[400],
155-
Error: Reds[500],
156-
} as const
157-
158151
const Tabs = {
159152
Transition,
160153
UnderLined: {
@@ -246,7 +239,7 @@ export const createLightDesign = (Light: typeof plain.Light | typeof inverted.Li
246239
Default: Grays[400],
247240
Active: Light.Text.highlight,
248241
Filled: Grays[850],
249-
Error: Feedback.Error,
242+
Error: Reds[500],
250243
},
251244
},
252245
Nested: {
@@ -256,7 +249,7 @@ export const createLightDesign = (Light: typeof plain.Light | typeof inverted.Li
256249
Default: Grays[400],
257250
Active: Light.Text.highlight,
258251
Filled: Grays[850],
259-
Error: Feedback.Error,
252+
Error: Reds[500],
260253
},
261254
},
262255
},
@@ -285,7 +278,6 @@ export const createLightDesign = (Light: typeof plain.Light | typeof inverted.Li
285278
Color,
286279
Text,
287280
Button,
288-
Feedback,
289281
Layer,
290282
Tabs,
291283
Chips,
@@ -493,13 +485,6 @@ export const createDarkDesign = (Dark: typeof plain.Dark | typeof inverted.Dark)
493485
},
494486
} as const
495487

496-
const Feedback = {
497-
Success: Greens[400],
498-
Info: Layer[3].Fill,
499-
Warning: Reds[300],
500-
Error: Reds[500],
501-
} as const
502-
503488
const Tabs = {
504489
Transition,
505490
UnderLined: {
@@ -589,7 +574,7 @@ export const createDarkDesign = (Dark: typeof plain.Dark | typeof inverted.Dark)
589574
Default: color[600],
590575
Active: Dark.Text.highlight,
591576
Filled: color[75],
592-
Error: Feedback.Error,
577+
Error: Reds[500],
593578
},
594579
},
595580
Nested: {
@@ -599,7 +584,7 @@ export const createDarkDesign = (Dark: typeof plain.Dark | typeof inverted.Dark)
599584
Default: color[600],
600585
Active: Dark.Text.highlight,
601586
Filled: color[75],
602-
Error: Feedback.Error,
587+
Error: Reds[500],
603588
},
604589
},
605590
},
@@ -628,7 +613,6 @@ export const createDarkDesign = (Dark: typeof plain.Dark | typeof inverted.Dark)
628613
Color,
629614
Text,
630615
Button,
631-
Feedback,
632616
Layer,
633617
Tabs,
634618
Chips,
@@ -779,13 +763,6 @@ export const createChadDesign = (Chad: typeof plain.Chad | typeof inverted.Chad)
779763
},
780764
} as const
781765

782-
const Feedback = {
783-
Success: Greens[400],
784-
Info: Layer[3].Fill,
785-
Warning: Reds[400],
786-
Error: Reds[500],
787-
} as const
788-
789766
const Tabs = {
790767
Transition,
791768
UnderLined: {
@@ -877,7 +854,7 @@ export const createChadDesign = (Chad: typeof plain.Chad | typeof inverted.Chad)
877854
Default: Violet[200],
878855
Active: Chad.Text.highlight,
879856
Filled: Violet[400],
880-
Error: Feedback.Error,
857+
Error: Reds[500],
881858
},
882859
},
883860
Nested: {
@@ -887,7 +864,7 @@ export const createChadDesign = (Chad: typeof plain.Chad | typeof inverted.Chad)
887864
Default: Violet[200],
888865
Active: Chad.Text.highlight,
889866
Filled: Violet[400],
890-
Error: Feedback.Error,
867+
Error: Reds[500],
891868
},
892869
},
893870
},
@@ -916,7 +893,6 @@ export const createChadDesign = (Chad: typeof plain.Chad | typeof inverted.Chad)
916893
Color,
917894
Text,
918895
Button,
919-
Feedback,
920896
Layer,
921897
Tabs,
922898
Chips,

packages/curve-ui-kit/src/themes/palette/palette.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { PaletteOptions } from '@mui/material'
33

44
export const createPalette = (
55
mode: 'light' | 'dark',
6-
{ Layer, Color, Feedback, Text: { TextColors } }: DesignSystem,
6+
{ Layer, Color, Text: { TextColors } }: DesignSystem,
77
): PaletteOptions => ({
88
mode,
99
primary: { main: Color.Primary[500] },

0 commit comments

Comments
 (0)