Skip to content

feat: upgrading colours & font in wave 2.0 | SUP-49317 #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ exports[`when a file gets submitted component removes the initial button 1`] = `
.c7 {
color: inherit;
font-size: 1rem;
font-family: "Open Sans",sans-serif;
font-family: "Roboto Flex","Open Sans",sans-serif;
line-height: 1.4;
margin: 0;
font-size: 0.875rem;
Expand All @@ -75,7 +75,7 @@ exports[`when a file gets submitted component removes the initial button 1`] = `
.c8 {
color: var(--wave-s-color-foreground-neutral-emphasized);
font-size: 1rem;
font-family: "Open Sans",sans-serif;
font-family: "Roboto Flex","Open Sans",sans-serif;
line-height: 1.4;
margin: 0;
font-size: 0.875rem;
Expand Down
4 changes: 2 additions & 2 deletions src/components/TabBar/__snapshots__/Link.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`TabBar.Link has a bright color if selected 1`] = `
cursor: pointer;
font-size: 0.875rem;
font-weight: 600;
font-family: "Open Sans",sans-serif;
font-family: "Roboto Flex","Open Sans",sans-serif;
margin-right: 1.5rem;
-webkit-text-decoration: none;
text-decoration: none;
Expand Down Expand Up @@ -53,7 +53,7 @@ exports[`TabBar.Link renders with default props 1`] = `
cursor: pointer;
font-size: 0.875rem;
font-weight: 600;
font-family: "Open Sans",sans-serif;
font-family: "Roboto Flex","Open Sans",sans-serif;
margin-right: 1.5rem;
-webkit-text-decoration: none;
text-decoration: none;
Expand Down
163 changes: 51 additions & 112 deletions src/essentials/Colors/Colors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,7 @@ import { createThemeGlobalStyle } from './globalStyles';
export const Colors = {
white: 'hsl(0, 0%, 100%)',
black: 'hsl(0, 0%, 0%)',
neutral: {
10: 'hsl(0, 0%, 11%)',
20: 'hsl(0, 0%, 19%)',
30: 'hsl(0, 0%, 28%)',
40: 'hsl(0, 0%, 37%)',
50: 'hsl(0, 0%, 47%)',
60: 'hsl(0, 0%, 57%)',
70: 'hsl(0, 0%, 67%)',
80: 'hsl(0, 0%, 78%)',
90: 'hsl(0, 0%, 89%)',
95: 'hsl(0, 0%, 95%)',
97: 'hsl(0, 0%, 98%)',
99: 'hsl(0, 0%, 99%)'
},
blue: {
10: 'hsl(214, 77%, 10%)',
20: 'hsl(215, 75%, 20%)',
30: 'hsl(214, 76%, 31%)',
40: 'hsl(214, 75%, 41%)',
50: 'hsl(214, 78%, 51%)',
60: 'hsl(214, 78%, 61%)',
70: 'hsl(214, 79%, 71%)',
80: 'hsl(215, 78%, 80%)',
90: 'hsl(215, 80%, 90%)',
95: 'hsl(215, 76%, 95%)',
97: 'hsl(218, 80%, 98%)',

primary: {
1100: 'hsl(211, 100%, 6%)',
900: 'hsl(211, 100%, 12%)',
Expand All @@ -45,23 +19,14 @@ export const Colors = {
1000: 'hsl(212, 92%, 34%)',
900: 'hsl(212, 92%, 45%)',
350: 'hsl(212, 75%, 78%)',
150: 'hsl(213, 74%, 91%)',
150: 'hsl(214, 74%, 91%)',
100: 'hsl(211, 74%, 94%)',
50: 'hsl(210, 75%, 97%)'
50: 'hsl(210, 73%, 97%)'
}
},
red: {
10: 'hsl(348, 100%, 13%)',
20: 'hsl(345, 100%, 20%)',
30: 'hsl(344, 100%, 29%)',
40: 'hsl(342, 100%, 37%)',
50: 'hsl(342, 100%, 45%)',
60: 'hsl(352, 100%, 66%)',
70: 'hsl(355, 100%, 76%)',
80: 'hsl(357, 100%, 85%)',
90: 'hsl(0, 100%, 93%)',
95: 'hsl(3, 100%, 96%)',
97: 'hsl(0, 100%, 98%)'
1000: 'hsl(352, 92%, 39%)',
900: 'hsl(352, 100%, 52%)'
},
magenta: {
1000: 'hsl(302, 100%, 37%)',
Expand All @@ -73,44 +38,18 @@ export const Colors = {
1000: 'hsl(149, 92%, 24%)',
900: 'hsl(149, 93%, 32%)',
350: 'hsl(149, 44%, 74%)',

10: 'hsl(124, 47%, 7%)',
20: 'hsl(122, 47%, 13%)',
30: 'hsl(124, 48%, 20%)',
40: 'hsl(123, 48%, 26%)',
50: 'hsl(123, 48%, 33%)',
60: 'hsl(123, 27%, 46%)',
70: 'hsl(124, 23%, 60%)',
80: 'hsl(122, 24%, 73%)',
90: 'hsl(124, 24%, 87%)',
95: 'hsl(120, 24%, 93%)',
97: 'hsl(120, 20%, 97%)'
50: 'hsl(144, 50%, 96%)'
},
yellow: {
10: 'hsl(45, 92%, 5%)',
20: 'hsl(45, 95%, 15%)',
30: 'hsl(46, 94%, 25%)',
40: 'hsl(46, 93%, 36%)',
50: 'hsl(46, 94%, 46%)',
60: 'hsl(46, 98%, 51%)',
70: 'hsl(46, 98%, 61%)',
80: 'hsl(46, 97%, 71%)',
90: 'hsl(46, 98%, 80%)',
95: 'hsl(46, 96%, 90%)',
97: 'hsl(46, 100%, 95%)'
900: 'hsl(48, 100%, 50%)',
350: 'hsl(48, 100%, 81%)',
50: 'hsl(48, 100%, 97%)'
},
orange: {
10: 'hsl(32, 92%, 10%)',
20: 'hsl(32, 92%, 20%)',
30: 'hsl(33, 92%, 30%)',
40: 'hsl(32, 92%, 45%)',
50: 'hsl(32, 92%, 50%)',
60: 'hsl(32, 91%, 55%)',
70: 'hsl(32, 91%, 65%)',
80: 'hsl(32, 92%, 75%)',
90: 'hsl(32, 92%, 85%)',
95: 'hsl(32, 92%, 90%)',
97: 'hsl(30, 100%, 96%)'
1000: 'hsl(21, 96%, 38%)',
900: 'hsl(21, 100%, 51%)',
350: 'hsl(21, 100%, 81%)',
50: 'hsl(20, 100%, 97%)'
},
transparent: 'transparent'
} as const;
Expand Down Expand Up @@ -153,11 +92,11 @@ export const SemanticColors = {
default: Colors.green[900]
},
warning: {
default: Colors.yellow[60]
default: Colors.yellow[900]
},
danger: {
default: Colors.orange[40],
emphasized: Colors.orange[30]
default: Colors.orange[900],
emphasized: Colors.orange[1000]
}
},
background: {
Expand Down Expand Up @@ -191,15 +130,15 @@ export const SemanticColors = {
emphasized: Colors.blue.secondary[900]
},
success: {
default: Colors.green[97]
default: Colors.green[50]
},
warning: {
default: Colors.yellow[97]
default: Colors.yellow[50]
},
danger: {
faded: Colors.orange[97],
default: Colors.orange[40],
emphasized: Colors.orange[30]
faded: Colors.orange[50],
default: Colors.orange[900],
emphasized: Colors.orange[1000]
}
},
surface: {
Expand All @@ -219,17 +158,17 @@ export const SemanticColors = {
emphasized: Colors.blue.secondary[900]
},
success: {
default: Colors.green[97],
default: Colors.green[50],
emphasized: Colors.green[900]
},
warning: {
default: Colors.yellow[97],
emphasized: Colors.yellow[60]
default: Colors.yellow[50],
emphasized: Colors.yellow[900]
},
danger: {
faded: Colors.orange[97],
default: Colors.orange[97],
emphasized: Colors.orange[40]
faded: Colors.orange[50],
default: Colors.orange[50],
emphasized: Colors.orange[900]
}
},
backdrop: Colors.blue.primary[900]
Expand Down Expand Up @@ -257,18 +196,18 @@ export const SemanticColors = {
default: Colors.green[900]
},
warning: {
banner: Colors.yellow[90],
default: Colors.yellow[60]
banner: Colors.yellow[350],
default: Colors.yellow[900]
},
danger: {
banner: Colors.orange[80],
faded: Colors.orange[80],
default: Colors.orange[40]
banner: Colors.orange[350],
faded: Colors.orange[350],
default: Colors.orange[900]
}
},
logo: {
free: 'hsl(350, 91%, 41%)',
now: 'hsl(350, 91%, 41%)',
free: 'hsl(342, 100%, 45%)',
now: 'hsl(342, 100%, 45%)',
subtitle: Colors.black,
lyft: 'hsl(316, 81%, 56%)'
},
Expand Down Expand Up @@ -320,11 +259,11 @@ export const SemanticColorsDarkSchema = {
default: Colors.green[900]
},
warning: {
default: Colors.yellow[60]
default: Colors.yellow[900]
},
danger: {
default: Colors.orange[40],
emphasized: Colors.orange[30]
default: Colors.orange[900],
emphasized: Colors.orange[1000]
}
},
background: {
Expand Down Expand Up @@ -358,15 +297,15 @@ export const SemanticColorsDarkSchema = {
emphasized: Colors.blue.secondary[1000]
},
success: {
default: Colors.green[97]
default: Colors.green[50]
},
warning: {
default: Colors.yellow[97]
default: Colors.yellow[50]
},
danger: {
faded: Colors.orange[30],
default: Colors.orange[40],
emphasized: Colors.orange[30]
faded: Colors.orange[1000],
default: Colors.orange[900],
emphasized: Colors.orange[1000]
}
},
surface: {
Expand All @@ -391,12 +330,12 @@ export const SemanticColorsDarkSchema = {
},
warning: {
default: Colors.blue.primary[750],
emphasized: Colors.yellow[60]
emphasized: Colors.yellow[900]
},
danger: {
faded: Colors.orange[80],
faded: Colors.orange[350],
default: Colors.blue.primary[750],
emphasized: Colors.red[40]
emphasized: Colors.red[1000]
}
},
backdrop: Colors.blue.primary[50]
Expand Down Expand Up @@ -424,20 +363,20 @@ export const SemanticColorsDarkSchema = {
default: Colors.green[900]
},
warning: {
banner: Colors.yellow[90],
default: Colors.yellow[60]
banner: Colors.yellow[350],
default: Colors.yellow[900]
},
danger: {
banner: Colors.orange[80],
faded: Colors.orange[40],
default: Colors.orange[40]
banner: Colors.orange[350],
faded: Colors.orange[900],
default: Colors.orange[900]
}
},
logo: {
free: 'hsl(350, 91%, 41%)',
free: 'hsl(342, 100%, 45%)',
now: Colors.white,
subtitle: Colors.white,
lyft: Colors.white
lyft: 'hsl(316, 81%, 56%)'
},
shadow: {
default: Colors.blue.primary[550]
Expand Down
Loading