Skip to content

Commit 662f458

Browse files
arentantarentant
authored
Merge pull request #98 from TrainProtocol/dev-themes
Fix app color palette and implement white theme, resolves FRONT-905
2 parents 8c88a39 + 41943d3 commit 662f458

96 files changed

Lines changed: 365 additions & 702 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/app/Models/Theme.ts‎

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
export type ThemeData = {
3+
background?: string,
34
buttonTextColor?: string,
5+
actionButtonColor?: string,
46
logo?: string,
57
tertiary?: string,
68
primary?: ThemeColor,
@@ -16,10 +18,6 @@ export type ThemeData = {
1618
hideTabs?: boolean,
1719
hideWallets?: boolean,
1820
}
19-
accent: {
20-
DEFAULT: string,
21-
hover: string
22-
}
2321
}
2422

2523

@@ -34,63 +32,10 @@ export type ThemeColor = {
3432
700: string;
3533
800: string;
3634
900: string;
37-
950: string;
3835
text: string,
3936
}
4037

4138
export type StatusColor = {
4239
Foreground: string;
4340
Background: string;
4441
}
45-
46-
export const THEME_COLORS: { [key: string]: ThemeData } = {
47-
"default": {
48-
tertiary: '128, 128, 128',
49-
buttonTextColor: '0, 0, 0',
50-
logo: '255, 255, 255',
51-
primary: {
52-
DEFAULT: '255, 255, 255',
53-
'100': '255, 255, 255',
54-
'200': '255, 255, 255',
55-
'300': '255, 255, 255',
56-
'400': '255, 255, 255',
57-
'500': '255, 255, 255',
58-
'600': '227, 227, 227',
59-
'700': '199, 199, 199',
60-
'800': '171, 171, 171',
61-
'900': '143, 143, 143',
62-
'950': '129, 129, 129',
63-
'text': '230, 230, 230',
64-
},
65-
accent: {
66-
DEFAULT: '39, 142, 246',
67-
hover: '35, 128, 222'
68-
},
69-
secondary: {
70-
DEFAULT: '32, 59, 70',
71-
'100': '87, 152, 178',
72-
'200': '70, 130, 154',
73-
'300': '58, 106, 126',
74-
'400': '61, 61, 61',
75-
'500': '51, 51, 51',
76-
'600': '46, 46, 46',
77-
'700': '38, 38, 38',
78-
'800': '34, 34, 34',
79-
'900': '27, 27, 27',
80-
'950': '18, 18, 18',
81-
'text': '200, 200, 200',
82-
},
83-
warning: {
84-
Foreground: '255, 201, 74',
85-
Background: '47, 43, 29',
86-
},
87-
error: {
88-
Foreground: '255, 97, 97',
89-
Background: '46, 27, 27',
90-
},
91-
success: {
92-
Foreground: '89, 224, 125',
93-
Background: '14, 43, 22',
94-
},
95-
},
96-
}

‎apps/app/components/ColorSchema.tsx‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎apps/app/components/ErrorFallback.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function ErrorFallback({ error, resetErrorBoundary }) {
1616
<main className="styled-scroll">
1717
<div className="min-h-screen overflow-hidden relative font-robo">
1818
<Navbar />
19-
<div className="mx-auto max-w-xl bg-secondary-900 shadow-card rounded-lg w-full overflow-hidden relative px-0 md:px-8 py-6 h-[500px] min-h-[550px]">
19+
<div className="mx-auto max-w-xl bg-secondary-700 shadow-card rounded-lg w-full overflow-hidden relative px-0 md:px-8 py-6 h-[500px] min-h-[550px]">
2020
<MessageComponent>
2121
<MessageComponent.Content icon="red">
2222
<MessageComponent.Header>

‎apps/app/components/FeeDetails/FeeDetailsComponent.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ReactNode } from "react"
22

33
const FeeDetails = ({ children }: { children: ReactNode }) => {
4-
return <div className="flex flex-col divide-y-2 divide-secondary-900 rounded-xl bg-secondary-700 overflow-hidden text-sm">
4+
return <div className="flex flex-col divide-y-2 divide-secondary-900 rounded-xl bg-secondary-500 overflow-hidden text-sm">
55
{children}
66
</div>
77
}

‎apps/app/components/Icons/CircularLoader.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { SVGProps } from "react"
22

33
const CircularLoader = (props: SVGProps<SVGSVGElement>) => {
44
return <svg xmlns="http://www.w3.org/2000/svg" width="32" height="33" viewBox="0 0 32 33" fill="none" {...props}>
5-
<path fillRule="evenodd" clipRule="evenodd" d="M30.4172 18.2327C31.26 18.4985 31.7278 19.3971 31.4621 20.2398L31.0633 21.5045L30.5291 22.7942L29.8845 24.0325L29.1345 25.2098L28.2847 26.3173L27.3416 27.3465L26.3124 28.2896L25.2049 29.1394L24.0275 29.8894L22.8513 30.5017C22.0675 30.9098 21.1013 30.6051 20.6933 29.8213C20.2852 29.0375 20.5899 28.0713 21.3737 27.6633L22.426 27.1155L23.3677 26.5156L24.2535 25.8359L25.0767 25.0816L25.831 24.2584L26.5107 23.3726L27.1106 22.4309L27.6261 21.4406L28.0534 20.409L28.4102 19.2776C28.6759 18.4348 29.5745 17.967 30.4172 18.2327Z" fill="#E42575" />
6-
<path fillRule="evenodd" clipRule="evenodd" d="M30.5546 15.0937C29.6919 15.2849 28.8375 14.7406 28.6462 13.8779L28.3895 12.7197L28.0537 11.6548L27.6264 10.6233L27.1109 9.63291L26.511 8.69125L25.8313 7.80545L25.077 6.98226L24.2538 6.22795L23.368 5.54825L22.4263 4.94834L21.436 4.43279L20.4044 4.00552L19.3396 3.66977L18.2495 3.42811L17.1425 3.28238L16.0271 3.23367L14.9116 3.28238L13.8047 3.42811L12.7146 3.66977L11.6498 4.00551L10.6182 4.43279L9.62786 4.94834L8.68618 5.54825L7.80038 6.22795L6.9772 6.98226L6.22288 7.80545L5.54319 8.69124L4.94329 9.6329L4.42772 10.6233L4.00046 11.6548L3.66471 12.7197L3.42305 13.8097L3.27731 14.9167L3.22861 16.0322L3.27731 17.1476L3.42305 18.2546L3.66471 19.3446L4.00045 20.4095L4.42772 21.441L4.94328 22.4314L5.54319 23.3731L6.22288 24.2588L6.9772 25.082L7.80039 25.8364L8.68617 26.516L9.62787 27.116L10.6182 27.6315L11.6497 28.0588L12.7146 28.3945L13.8047 28.6362L14.9116 28.7819L16.0969 28.8337C16.9797 28.8722 17.6641 29.6191 17.6256 30.5019C17.587 31.3848 16.8401 32.0692 15.9573 32.0306L14.6325 31.9728L13.2485 31.7906L11.8856 31.4884L10.5542 31.0687L9.26455 30.5345L8.02632 29.8899L6.84899 29.1398L5.74151 28.29L4.7123 27.3469L3.76921 26.3177L2.9194 25.2102L2.16936 24.0329L1.52478 22.7947L0.990575 21.505L0.570802 20.1737L0.268661 18.8108L0.0864524 17.4268L0.0255624 16.0321L0.0864562 14.6375L0.268663 13.2535L0.570804 11.8907L0.990572 10.5593L1.52478 9.26961L2.16936 8.03139L2.91941 6.85405L3.76921 5.74657L4.7123 4.71736L5.7415 3.77427L6.84899 2.92447L8.02632 2.17442L9.26455 1.52984L10.5542 0.995635L11.8856 0.575864L13.2485 0.273725L14.6325 0.0915153L16.0271 0.030625L17.4217 0.091515L18.8057 0.273724L20.1686 0.575863L21.4999 0.995635L22.7896 1.52984L24.0278 2.17442L25.2052 2.92447L26.3127 3.77427L27.3419 4.71736L28.285 5.74657L29.1348 6.85405L29.8848 8.03139L30.5294 9.26961L31.0636 10.5593L31.4834 11.8907L31.7704 13.1853C31.9616 14.048 31.4173 14.9024 30.5546 15.0937Z" fill="#F8C8DC" />
5+
<path fillRule="evenodd" clipRule="evenodd" d="M30.4172 18.2327C31.26 18.4985 31.7278 19.3971 31.4621 20.2398L31.0633 21.5045L30.5291 22.7942L29.8845 24.0325L29.1345 25.2098L28.2847 26.3173L27.3416 27.3465L26.3124 28.2896L25.2049 29.1394L24.0275 29.8894L22.8513 30.5017C22.0675 30.9098 21.1013 30.6051 20.6933 29.8213C20.2852 29.0375 20.5899 28.0713 21.3737 27.6633L22.426 27.1155L23.3677 26.5156L24.2535 25.8359L25.0767 25.0816L25.831 24.2584L26.5107 23.3726L27.1106 22.4309L27.6261 21.4406L28.0534 20.409L28.4102 19.2776C28.6759 18.4348 29.5745 17.967 30.4172 18.2327Z" fill="rgb(var(--ls-colors-primary, 39, 142, 246))" />
6+
<path fillRule="evenodd" clipRule="evenodd" d="M30.5546 15.0937C29.6919 15.2849 28.8375 14.7406 28.6462 13.8779L28.3895 12.7197L28.0537 11.6548L27.6264 10.6233L27.1109 9.63291L26.511 8.69125L25.8313 7.80545L25.077 6.98226L24.2538 6.22795L23.368 5.54825L22.4263 4.94834L21.436 4.43279L20.4044 4.00552L19.3396 3.66977L18.2495 3.42811L17.1425 3.28238L16.0271 3.23367L14.9116 3.28238L13.8047 3.42811L12.7146 3.66977L11.6498 4.00551L10.6182 4.43279L9.62786 4.94834L8.68618 5.54825L7.80038 6.22795L6.9772 6.98226L6.22288 7.80545L5.54319 8.69124L4.94329 9.6329L4.42772 10.6233L4.00046 11.6548L3.66471 12.7197L3.42305 13.8097L3.27731 14.9167L3.22861 16.0322L3.27731 17.1476L3.42305 18.2546L3.66471 19.3446L4.00045 20.4095L4.42772 21.441L4.94328 22.4314L5.54319 23.3731L6.22288 24.2588L6.9772 25.082L7.80039 25.8364L8.68617 26.516L9.62787 27.116L10.6182 27.6315L11.6497 28.0588L12.7146 28.3945L13.8047 28.6362L14.9116 28.7819L16.0969 28.8337C16.9797 28.8722 17.6641 29.6191 17.6256 30.5019C17.587 31.3848 16.8401 32.0692 15.9573 32.0306L14.6325 31.9728L13.2485 31.7906L11.8856 31.4884L10.5542 31.0687L9.26455 30.5345L8.02632 29.8899L6.84899 29.1398L5.74151 28.29L4.7123 27.3469L3.76921 26.3177L2.9194 25.2102L2.16936 24.0329L1.52478 22.7947L0.990575 21.505L0.570802 20.1737L0.268661 18.8108L0.0864524 17.4268L0.0255624 16.0321L0.0864562 14.6375L0.268663 13.2535L0.570804 11.8907L0.990572 10.5593L1.52478 9.26961L2.16936 8.03139L2.91941 6.85405L3.76921 5.74657L4.7123 4.71736L5.7415 3.77427L6.84899 2.92447L8.02632 2.17442L9.26455 1.52984L10.5542 0.995635L11.8856 0.575864L13.2485 0.273725L14.6325 0.0915153L16.0271 0.030625L17.4217 0.091515L18.8057 0.273724L20.1686 0.575863L21.4999 0.995635L22.7896 1.52984L24.0278 2.17442L25.2052 2.92447L26.3127 3.77427L27.3419 4.71736L28.285 5.74657L29.1348 6.85405L29.8848 8.03139L30.5294 9.26961L31.0636 10.5593L31.4834 11.8907L31.7704 13.1853C31.9616 14.048 31.4173 14.9024 30.5546 15.0937Z" fill="rgb(var(--ls-colors-primary-300, 150, 195, 248))" />
77
</svg>
88
}
99

0 commit comments

Comments
 (0)