Skip to content

Commit 0ef8614

Browse files
anth-volkanth-volk
authored
Merge pull request #2350 from Devansh633/master
fix: Remove duplicate color names #2335
2 parents 3ceb937 + 69898a1 commit 0ef8614

19 files changed

+35
-48
lines changed

‎src/controls/Button.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export const buttonStyles = {
1717
},
1818
primaryBlue: {
1919
standard: {
20-
backgroundColor: colors.BLUE_PRIMARY,
21-
borderColor: colors.BLUE_PRIMARY,
20+
backgroundColor: colors.BLUE,
21+
borderColor: colors.BLUE,
2222
color: colors.WHITE,
2323
},
2424
hover: {
@@ -42,8 +42,8 @@ export const buttonStyles = {
4242
secondaryBlue: {
4343
standard: {
4444
backgroundColor: "transparent",
45-
borderColor: colors.BLUE_PRIMARY,
46-
color: colors.BLUE_PRIMARY,
45+
borderColor: colors.BLUE,
46+
color: colors.BLUE,
4747
},
4848
hover: {
4949
backgroundColor: colors.BLUE_PRESSED,

‎src/data/countries.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const COUNTRY_BASELINE_POLICIES = {
4242
};
4343

4444
export const STATUS_COLORS = {
45-
OK: colors.BLUE_95,
45+
OK: colors.BLUE_LIGHT,
4646
ERROR: colors.DARK_RED,
4747
Pending: colors.LIGHT_GRAY,
4848
};

‎src/forms/FormInput.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ export default function FormItem(props) {
8888
fontSize: 15,
8989
fontWeight: 300,
9090
padding: 10,
91-
boxShadow: `0px 0px 0px ${style.colors.BLUE_PRIMARY}`,
91+
boxShadow: `0px 0px 0px ${style.colors.BLUE}`,
9292
...inputStyle,
9393
}}
9494
// While focusing, make the bottom border blue from left to right
9595
whileFocus={{
96-
boxShadow: focusStyle || `0px 5px 0px ${style.colors.BLUE_PRIMARY}`,
96+
boxShadow: focusStyle || `0px 5px 0px ${style.colors.BLUE}`,
9797
}}
9898
/>
9999
</div>

‎src/layout/Header.jsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default function Header() {
4343
<>
4444
<div
4545
style={{
46-
backgroundColor: style.colors.BLUE_PRIMARY,
46+
backgroundColor: style.colors.BLUE,
4747
width: "100vw",
4848
height: style.spacing.HEADER_HEIGHT,
4949
display: "flex",
@@ -239,7 +239,7 @@ function LoginButton() {
239239
(e.currentTarget.style.backgroundColor = style.colors.DARK_BLUE_HOVER)
240240
}
241241
onMouseOut={(e) =>
242-
(e.currentTarget.style.backgroundColor = style.colors.BLUE_PRIMARY)
242+
(e.currentTarget.style.backgroundColor = style.colors.BLUE)
243243
}
244244
>
245245
{isAuthenticated && user && user.picture ? (
@@ -429,7 +429,7 @@ function PageLinks() {
429429
cursor: "pointer",
430430
}}
431431
whileHover={{
432-
color: style.colors.BLUE_PRIMARY,
432+
color: style.colors.BLUE,
433433
}}
434434
transition={{
435435
duration: 0.2,
@@ -459,7 +459,7 @@ function LeftNavigationMenu(props) {
459459
left: 0,
460460
width: "100vw",
461461
height: "100vh",
462-
backgroundColor: style.colors.BLUE_PRIMARY,
462+
backgroundColor: style.colors.BLUE,
463463
zIndex: -1,
464464
paddingTop: 100,
465465
}}
@@ -508,7 +508,7 @@ function LeftNavigationMenu(props) {
508508
color: style.colors.WHITE,
509509
}}
510510
whileHover={{
511-
color: style.colors.BLUE_PRIMARY,
511+
color: style.colors.BLUE,
512512
}}
513513
animate={
514514
isOpen

‎src/layout/MarkdownFormatter.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ export function MarkdownFormatter({ markdown, backgroundColor, dict, pSize }) {
423423
fontFamily: "Roboto Serif",
424424
fontSize: mobile ? 16 : 18,
425425
borderBottom: "1px solid black",
426-
backgroundColor: style.colors.BLUE_PRIMARY,
426+
backgroundColor: style.colors.BLUE,
427427
textAlign: "center",
428428
verticalAlign: "middle",
429429
color: "white",

‎src/layout/PageHeader.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default function PageHeader({
4545
>
4646
<h2
4747
style={{
48-
color: style.colors.BLUE_PRIMARY,
48+
color: style.colors.BLUE,
4949
}}
5050
>
5151
{title}

‎src/layout/Section.jsx‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ export default function Section({
2424
}[displayCategory];
2525
let titleColor = null;
2626
if (
27-
[style.colors.BLUE_PRIMARY, style.colors.BLUE_PRESSED].includes(
28-
backgroundColor,
29-
)
27+
[style.colors.BLUE, style.colors.BLUE_PRESSED].includes(backgroundColor)
3028
) {
3129
titleColor = style.colors.WHITE;
3230
}
@@ -87,9 +85,7 @@ export function SectionTop({ height, backgroundColor, title }) {
8785
}[displayCategory];
8886
let titleColor = null;
8987
if (
90-
[style.colors.BLUE_PRIMARY, style.colors.BLUE_PRESSED].includes(
91-
backgroundColor,
92-
)
88+
[style.colors.BLUE, style.colors.BLUE_PRESSED].includes(backgroundColor)
9389
) {
9490
titleColor = style.colors.WHITE;
9591
}
@@ -135,9 +131,7 @@ export function SectionBottom({ height, backgroundColor, children }) {
135131
}[displayCategory];
136132
let titleColor = null;
137133
if (
138-
[style.colors.BLUE_PRIMARY, style.colors.BLUE_PRESSED].includes(
139-
backgroundColor,
140-
)
134+
[style.colors.BLUE, style.colors.BLUE_PRESSED].includes(backgroundColor)
141135
) {
142136
titleColor = style.colors.WHITE;
143137
}

‎src/layout/SmallForm.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ export default function SmallForm(props) {
118118
fontSize: 20,
119119
fontWeight: 300,
120120
padding: 10,
121-
boxShadow: `0px 0px 0px ${style.colors.BLUE_PRIMARY}`,
121+
boxShadow: `0px 0px 0px ${style.colors.BLUE}`,
122122
...inputStyle,
123123
}}
124124
// While focussing, make the bottom border blue from left to right
125125
whileFocus={{
126126
boxShadow: isFormSubmitted
127127
? `0px 5px 0px ${style.colors.TEAL_ACCENT}`
128-
: `0px 5px 0px ${style.colors.BLUE_PRIMARY}`,
128+
: `0px 5px 0px ${style.colors.BLUE}`,
129129
}}
130130
/>
131131
</div>

‎src/layout/TextBox.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ export default function TextBox({
4949
fontSize: fontSize || 20,
5050
fontWeight: 300,
5151
padding: 10,
52-
boxShadow: `0px 0px 0px ${style.colors.BLUE_PRIMARY}`,
52+
boxShadow: `0px 0px 0px ${style.colors.BLUE}`,
5353
}}
5454
// While focussing, make the bottom border blue from left to right
5555
whileFocus={{
56-
boxShadow: `0px 5px 0px ${style.colors.BLUE_PRIMARY}`,
56+
boxShadow: `0px 5px 0px ${style.colors.BLUE}`,
5757
}}
5858
/>
5959
</form>

‎src/pages/About.jsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function About() {
3131
<Link
3232
to={`/${countryId}/jobs`}
3333
style={{
34-
color: style.colors.BLUE_PRIMARY,
34+
color: style.colors.BLUE,
3535
textDecoration: "underline",
3636
}}
3737
>
@@ -45,14 +45,14 @@ export default function About() {
4545
return <Bio key={index} member={founders[founder]} />;
4646
})}
4747
</Section>
48-
<Section backgroundColor={style.colors.BLUE_PRIMARY}>
48+
<Section backgroundColor={style.colors.BLUE}>
4949
<h2 style={{ color: style.colors.WHITE }}>Team</h2>
5050
{Object.keys(staff).map((member, index) => {
5151
return <InvertedBio key={index} member={staff[member]} />;
5252
})}
5353
</Section>
5454
<div style={{ display: "none" }}>
55-
<Section backgroundColor={style.colors.BLUE_PRIMARY}>
55+
<Section backgroundColor={style.colors.BLUE}>
5656
<h2 style={{ color: style.colors.WHITE }}>Advisory board</h2>
5757
<InvertedBio member={advisors.tim_shaw} />
5858
<InvertedBio member={advisors.damola_ogundipe} />

0 commit comments

Comments
 (0)