Skip to content

Commit c3665cd

Browse files
committed
styles: update colors from style guide
1 parent a1f410a commit c3665cd

File tree

9 files changed

+29
-28
lines changed

9 files changed

+29
-28
lines changed

app/src/components/NodeStatus.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const Styled = {
1717
`,
1818
Divider: styled.div`
1919
height: 2px;
20-
background-color: ${props => props.theme.colors.gray};
20+
background-color: ${props => props.theme.colors.darkGray};
2121
margin: 20px 0;
2222
opacity: 0.5;
2323
`,

app/src/components/common/Radio.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ const Styled = {
1313
display: inline-block;
1414
padding: 5px 15px;
1515
margin-bottom: 10px;
16-
border: 1px solid ${props => props.theme.colors.whitish};
16+
border: 1px solid ${props => props.theme.colors.offWhite};
1717
color: ${props =>
18-
props.active ? props.theme.colors.darkBlue : props.theme.colors.whitish};
18+
props.active ? props.theme.colors.darkBlue : props.theme.colors.offWhite};
1919
background-color: ${props =>
2020
props.active ? props.theme.colors.white : props.theme.colors.darkBlue};
2121
cursor: pointer;
2222
2323
&:hover {
24-
color: ${props => props.theme.colors.whitish};
24+
color: ${props => props.theme.colors.offWhite};
2525
background-color: ${props => props.theme.colors.darkBlue};
26-
border: 1px solid ${props => props.theme.colors.whitish}33;
26+
border: 1px solid ${props => props.theme.colors.offWhite}33;
2727
}
2828
`,
2929
};

app/src/components/common/Tile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const Styled = {
77
TileWrap: styled.div`
88
min-height: 105px;
99
padding: 15px;
10-
background-color: ${props => props.theme.colors.tileBack};
10+
background-color: ${props => props.theme.colors.overlay};
1111
border-radius: 4px;
1212
`,
1313
Header: styled.div`

app/src/components/common/base.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const Pill = styled.span`
2020
padding: 5px;
2121
margin-right: 10px;
2222
text-align: center;
23-
background-color: ${props => props.theme.colors.tileBack};
23+
background-color: ${props => props.theme.colors.overlay};
2424
border-radius: 40px;
2525
`;
2626

@@ -43,9 +43,9 @@ export const Button = styled.button<ButtonProps>`
4343
padding-left: 15px;
4444
padding-right: 15px;
4545
text-align: center;
46-
color: ${props => props.theme.colors.whitish};
46+
color: ${props => props.theme.colors.offWhite};
4747
background-color: ${props => props.theme.colors.blue};
48-
border: 1px solid ${props => props.theme.colors.whitish};
48+
border: 1px solid ${props => props.theme.colors.offWhite};
4949
border-radius: 22px;
5050
5151
&:hover {
@@ -64,7 +64,7 @@ export const Button = styled.button<ButtonProps>`
6464
`
6565
background-color: transparent;
6666
&:hover {
67-
color: ${props.theme.colors.whitish};
67+
color: ${props.theme.colors.offWhite};
6868
text-decoration: underline;
6969
background-color: transparent;
7070
}
@@ -118,8 +118,8 @@ export const RadioButton = styled.span<RadioButtonProps>`
118118
width: 14px;
119119
height: 14px;
120120
border-radius: 14px;
121-
border: 1px solid ${props => props.theme.colors.whitish};
122-
background-color: ${props => (props.checked ? props.theme.colors.whitish : 'none')};
121+
border: 1px solid ${props => props.theme.colors.offWhite};
122+
background-color: ${props => (props.checked ? props.theme.colors.offWhite : 'none')};
123123
124124
&:hover {
125125
opacity: 0.8;
@@ -181,15 +181,15 @@ export const RangeInput = styled.input`
181181
height: 2rem;
182182
margin-top: -0.9rem; /* (track-height - thumb-height) / 2 */
183183
color: ${props => props.theme.colors.darkBlue};
184-
background-color: ${props => props.theme.colors.whitish};
184+
background-color: ${props => props.theme.colors.offWhite};
185185
background-image: url(${Chevrons});
186186
border: 0.2rem solid ${props => props.theme.colors.darkBlue};
187187
box-shadow: 0 0 0 2px ${props => props.theme.colors.pink};
188188
border-radius: 2rem;
189189
190190
&:active,
191191
&:hover {
192-
background-color: ${props => props.theme.colors.whitish}dd;
192+
background-color: ${props => props.theme.colors.offWhite}dd;
193193
}
194194
}
195195
@@ -203,14 +203,14 @@ export const RangeInput = styled.input`
203203
width: 2rem;
204204
height: 2rem;
205205
color: ${props => props.theme.colors.darkBlue};
206-
background-color: ${props => props.theme.colors.whitish};
206+
background-color: ${props => props.theme.colors.offWhite};
207207
border: 0.2rem solid ${props => props.theme.colors.darkBlue};
208208
box-shadow: 0 0 0 2px ${props => props.theme.colors.pink};
209209
border-radius: 2rem;
210210
211211
&:active,
212212
&:hover {
213-
background-color: ${props => props.theme.colors.whitish}dd;
213+
background-color: ${props => props.theme.colors.offWhite}dd;
214214
}
215215
}
216216
@@ -224,14 +224,14 @@ export const RangeInput = styled.input`
224224
width: 2rem;
225225
height: 2rem;
226226
color: ${props => props.theme.colors.darkBlue};
227-
background-color: ${props => props.theme.colors.whitish};
227+
background-color: ${props => props.theme.colors.offWhite};
228228
border: 0.2rem solid ${props => props.theme.colors.darkBlue};
229229
box-shadow: 0 0 0 2px ${props => props.theme.colors.pink};
230230
border-radius: 2rem;
231231
232232
&:active,
233233
&:hover {
234-
background-color: ${props => props.theme.colors.whitish}dd;
234+
background-color: ${props => props.theme.colors.offWhite}dd;
235235
}
236236
}
237237

app/src/components/layout/NavMenu.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,18 @@ const Styled = {
2424
line-height: 50px;
2525
padding: 0 12px;
2626
border-left: 3px solid transparent;
27-
color: ${props => props.theme.colors.whitish};
27+
color: ${props => props.theme.colors.offWhite};
2828
cursor: pointer;
2929
3030
&:hover {
3131
text-decoration: none;
3232
border-left: 3px solid ${props => props.theme.colors.pink};
33+
background-color: ${props => props.theme.colors.overlay};
3334
}
3435
}
3536
3637
&.active span {
37-
border-left: 3px solid ${props => props.theme.colors.whitish};
38+
border-left: 3px solid ${props => props.theme.colors.offWhite};
3839
background-color: ${props => props.theme.colors.blue};
3940
4041
&:hover {

app/src/components/loop/ChannelRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const Styled = {
3333
`
3434
&:hover {
3535
cursor: pointer;
36-
background-color: ${props.theme.colors.tileBack};
36+
background-color: ${props.theme.colors.overlay};
3737
}
3838
`}
3939
`,

app/src/components/loop/LoopActions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const Styled = {
2121
2222
> button {
2323
margin-left: 10px;
24-
background-color: ${props => props.theme.colors.tileBack};
24+
background-color: ${props => props.theme.colors.overlay};
2525
}
2626
`,
2727
CloseIcon: styled(Close)`

app/src/components/loop/processing/FailedSwap.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const Styled = {
1717
height: 34px;
1818
text-align: center;
1919
line-height: 30px;
20-
background-color: ${props => props.theme.colors.darkGray};
20+
background-color: ${props => props.theme.colors.gray};
2121
border-radius: 34px;
2222
margin-right: 10px;
2323
cursor: pointer;

app/src/components/theme.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ export interface Theme {
3131
gray: string;
3232
darkGray: string;
3333
white: string;
34-
whitish: string;
34+
offWhite: string;
3535
pink: string;
3636
green: string;
3737
orange: string;
38-
tileBack: string;
3938
purple: string;
39+
overlay: string;
4040
};
4141
}
4242

@@ -67,14 +67,14 @@ const theme: Theme = {
6767
blue: '#252f4a',
6868
darkBlue: '#212133',
6969
gray: '#848a99',
70-
darkGray: '#6b6969',
70+
darkGray: '#6b6969ef',
7171
white: '#ffffff',
72-
whitish: '#f5f5f5',
72+
offWhite: '#f5f5f5',
7373
pink: '#f5406e',
7474
green: '#46E80E',
7575
orange: '#f66b1c',
76-
tileBack: 'rgba(245,245,245,0.04)',
7776
purple: '#57038d',
77+
overlay: 'rgba(245,245,245,0.04)',
7878
},
7979
};
8080

0 commit comments

Comments
 (0)