diff --git a/packages/desktop-client/src/style/colors.ts b/packages/desktop-client/src/style/colors.ts deleted file mode 100644 index 9248454d53..0000000000 --- a/packages/desktop-client/src/style/colors.ts +++ /dev/null @@ -1,70 +0,0 @@ -export const y1 = '#733309'; -export const y2 = '#87540d'; -export const y3 = '#B88115'; -export const y4 = '#D4A31C'; -export const y5 = '#E6BB20'; -export const y6 = '#F2D047'; -export const y7 = '#F5E35D'; -export const y8 = '#FCF088'; -export const y9 = '#FFF7C4'; -export const y10 = '#FFFBEA'; -export const y11 = '#FFFEFA'; -export const r1 = '#610316'; -export const r2 = '#8A041A'; -export const r3 = '#AB091E'; -export const r4 = '#CF1124'; -export const r5 = '#E12D39'; -export const r6 = '#EF4E4E'; -export const r7 = '#F86A6A'; -export const r8 = '#FF9B9B'; -export const r9 = '#FFBDBD'; -export const r10 = '#FFE3E3'; -export const r11 = '#FFF1F1'; -export const b1 = '#034388'; -export const b2 = '#0B5FA3'; -export const b3 = '#1271BF'; -export const b4 = '#1980D4'; -export const b5 = '#2B8FED'; -export const b6 = '#40A5F7'; -export const b7 = '#66B5FA'; -export const b8 = '#8BCAFD'; -export const b9 = '#B3D9FF'; -export const b10 = '#E3F0FF'; -export const b11 = '#F5FCFF'; -export const n1 = '#102A43'; -export const n2 = '#243B53'; -export const n3 = '#334E68'; -export const n4 = '#486581'; -export const n5 = '#627D98'; -export const n6 = '#829AB1'; -export const n7 = '#9FB3C8'; -export const n8 = '#BCCCDC'; -export const n9 = '#D9E2EC'; -export const n10 = '#E8ECF0'; -export const n11 = '#F7FAFC'; -export const g1 = '#014D40'; -export const g2 = '#0C6B58'; -export const g3 = '#147D64'; -export const g4 = '#199473'; -export const g5 = '#27AB83'; -export const g6 = '#3EBD93'; -export const g7 = '#65D6AD'; -export const g8 = '#8EEDC7'; -export const g9 = '#C6F7E2'; -export const g10 = '#EFFCF6'; -export const g11 = '#FAFFFD'; -export const p1 = '#44056E'; -export const p2 = '#580A94'; -export const p3 = '#690CB0'; -export const p4 = '#7A0ECC'; -export const p5 = '#8719E0'; -export const p6 = '#9446ED'; -export const p7 = '#A368FC'; -export const p8 = '#B990FF'; -export const p9 = '#DAC4FF'; -export const p10 = '#F2EBFE'; -export const p11 = '#F9F6FE'; - -export const border = n10; -export const hover = '#fafafa'; -export const selected = b9; diff --git a/packages/desktop-client/src/style/index.ts b/packages/desktop-client/src/style/index.ts index 62ad4b40df..625e02c2af 100644 --- a/packages/desktop-client/src/style/index.ts +++ b/packages/desktop-client/src/style/index.ts @@ -1,4 +1,2 @@ -// oxlint-disable-next-line eslint/no-restricted-imports -export * as colors from './colors'; export * from './styles'; export * from './theme'; diff --git a/packages/desktop-client/src/style/palette.ts b/packages/desktop-client/src/style/palette.ts index 5ca9ff1420..98674d2e2e 100644 --- a/packages/desktop-client/src/style/palette.ts +++ b/packages/desktop-client/src/style/palette.ts @@ -1,6 +1,3 @@ -// oxlint-disable-next-line eslint/no-restricted-imports -import * as oldColors from './colors'; - // Only for use in contextual color definitions export const gray50 = '#f6f8fa'; export const gray80 = '#f0f4f6'; @@ -14,73 +11,75 @@ export const gray600 = '#373b4a'; export const gray700 = '#242733'; export const gray800 = '#141520'; export const gray900 = '#080811'; -export const navy50 = oldColors.n11; -export const navy100 = oldColors.n10; -export const navy150 = oldColors.n9; -export const navy200 = oldColors.n8; -export const navy300 = oldColors.n7; -export const navy400 = oldColors.n6; -export const navy500 = oldColors.n5; -export const navy600 = oldColors.n4; -export const navy700 = oldColors.n3; -export const navy800 = oldColors.n2; -export const navy900 = oldColors.n1; -export const blue50 = oldColors.b11; -export const blue100 = oldColors.b10; -export const blue150 = oldColors.b9; -export const blue200 = oldColors.b8; -export const blue300 = oldColors.b7; -export const blue400 = oldColors.b6; -export const blue500 = oldColors.b5; -export const blue600 = oldColors.b4; -export const blue700 = oldColors.b3; -export const blue800 = oldColors.b2; -export const blue900 = oldColors.b1; -export const green50 = oldColors.g11; -export const green100 = oldColors.g10; -export const green150 = oldColors.g9; -export const green200 = oldColors.g8; -export const green300 = oldColors.g7; -export const green400 = oldColors.g6; -export const green500 = oldColors.g5; -export const green600 = oldColors.g4; -export const green700 = oldColors.g3; -export const green800 = oldColors.g2; -export const green900 = oldColors.g1; -export const orange50 = oldColors.y11; -export const orange100 = oldColors.y10; -export const orange150 = oldColors.y9; -export const orange200 = oldColors.y8; -export const orange300 = oldColors.y7; -export const orange400 = oldColors.y6; -export const orange500 = oldColors.y5; -export const orange600 = oldColors.y4; -export const orange700 = oldColors.y3; -export const orange800 = oldColors.y2; -export const orange900 = oldColors.y1; -export const red50 = oldColors.r11; -export const red100 = oldColors.r10; -export const red150 = oldColors.r9; -export const red200 = oldColors.r8; -export const red300 = oldColors.r7; -export const red400 = oldColors.r6; -export const red500 = oldColors.r5; -export const red600 = oldColors.r4; -export const red700 = oldColors.r3; -export const red800 = oldColors.r2; -export const red900 = oldColors.r1; -export const purple50 = oldColors.p11; -export const purple100 = oldColors.p10; +export const navy50 = '#f7fafc'; +export const navy100 = '#e8ecf0'; +export const navy150 = '#d9e2ec'; +export const navy200 = '#bcccdc'; +export const navy300 = '#9fb3c8'; +export const navy400 = '#829ab1'; +export const navy500 = '#627d98'; +export const navy600 = '#486581'; +export const navy700 = '#334e68'; +export const navy800 = '#243b53'; +export const navy900 = '#102a43'; +export const blue50 = '#f5fcff'; +export const blue100 = '#e3f0ff'; +export const blue150 = '#b3d9ff'; +export const blue200 = '#8bcafd'; +export const blue300 = '#66b5fa'; +export const blue400 = '#40a5f7'; +export const blue500 = '#2b8fed'; +export const blue600 = '#1980d4'; +export const blue700 = '#1271bf'; +export const blue800 = '#0b5fa3'; +export const blue900 = '#034388'; +export const green50 = '#fafffd'; +export const green100 = '#effcf6'; +export const green150 = '#c6f7e2'; +export const green200 = '#8eedc7'; +export const green300 = '#65d6ad'; +export const green400 = '#3ebd93'; +export const green500 = '#27ab83'; +export const green600 = '#199473'; +export const green700 = '#147d64'; +export const green800 = '#0c6b58'; +export const green900 = '#014d40'; +export const orange50 = '#fffefa'; +export const orange100 = '#fffbea'; +export const orange150 = '#fff7c4'; +export const orange200 = '#fcf088'; +export const orange300 = '#f5e35d'; +export const orange400 = '#f2d047'; +export const orange500 = '#e6bb20'; +export const orange600 = '#d4a31c'; +export const orange700 = '#b88115'; +export const orange800 = '#87540d'; +export const orange900 = '#733309'; +export const red50 = '#fff1f1'; +export const red100 = '#ffe3e3'; +export const red150 = '#ffbdbd'; +export const red200 = '#ff9b9b'; +export const red300 = '#f86a6a'; +export const red400 = '#ef4e4e'; +export const red500 = '#e12d39'; +export const red600 = '#cf1124'; +export const red700 = '#ab091e'; +export const red800 = '#8a041a'; +export const red900 = '#610316'; +export const purple50 = '#f9f6fe'; +export const purple100 = '#f2ebfe'; export const purple125 = '#e4d4ff'; -export const purple150 = oldColors.p9; -export const purple200 = oldColors.p8; -export const purple300 = oldColors.p7; -export const purple400 = oldColors.p6; -export const purple500 = oldColors.p5; -export const purple600 = oldColors.p4; -export const purple700 = oldColors.p3; -export const purple800 = oldColors.p2; -export const purple900 = oldColors.p1; +export const purple150 = '#dac4ff'; +export const purple200 = '#b990ff'; +export const purple300 = '#a368fc'; +export const purple400 = '#9446ed'; +export const purple500 = '#8719e0'; +export const purple600 = '#7a0ecc'; +export const purple700 = '#690cb0'; +export const purple800 = '#580a94'; +export const purple900 = '#44056e'; export const white = '#ffffff'; export const black = '#000000'; -export const hover = oldColors.hover; +export const hover = '#fafafa'; +export const border = '#e8ecf0'; +export const selected = '#b3d9ff'; diff --git a/upcoming-release-notes/6627.md b/upcoming-release-notes/6627.md new file mode 100644 index 0000000000..8823178df5 --- /dev/null +++ b/upcoming-release-notes/6627.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [Juulz] +--- + +Copy hex color definitions from colors.ts (oldColors) into palette.ts