Skip to content
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.

Sign up for GitHub

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

Implement style guide in Tailwind config #85

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Implement style guide in Tailwind config #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb137f1
Testing of first tailwint styling
vikranthchinnam Apr 15, 2023
3743cb4
Finished talwind.config.js
vikranthchinnam Apr 17, 2023
ddc17fd
updated the neutral-5 to the actual color from figma
vikranthchinnam Apr 17, 2023
8b3077b
syntax and deleting comments
vikranthchinnam Apr 17, 2023
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
3 changes: 2 additions & 1 deletion pages/404.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ export default function Entry404() {
<main className="p-16">
<div className="max-w-4xl mx-auto space-y-4">
<div className="p-12 bg-white rounded-xl shadow-md">
<h1 className="text-headline4 text-[96px] font-bold font-display">Whoops!</h1>
<h1 className="text-headline4 text-[96px] font-bold font-display ">Whoops!</h1>
{/* <h1 className="text-display-extra-large">Whoops!</h1>*/}
Comment on lines +9 to +10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget to remove commented code from changes being merged into develop.

<div className="text-4xl">We couldn&apos;t find what you were looking for.</div>
<div className="mt-4 text-lg text-2xl">
Go{' '}
Expand Down
159 changes: 104 additions & 55 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,102 +8,151 @@ module.exports = {
theme: {
extend: {
colors: {
primary: {
light: '#6470F7',
DEFAULT: '#2F3FF4',
dark: '#0B1CD5',
'primary-blue': {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works, but let's rename this to just primary.

1: '#E2E7FF',
2: '#ABBAF9',
3: '#4659A7',
4: '#394B9F',
5: '#3D4E94',
6: '#29376E',
},
secondary: {
light: '#2FEEAB',
DEFAULT: '#11D08D',
dark: '#0C9766',
neutral: {
1: '#FFFFFF',
2: '#BEBEBE',
3: '#909090',
4: '#5C5C5C',
5: '#353535',
6: '#000000',
},
'neutral-variant': {
1: '#FFFFFF',
2: '#BEC0C9',
3: '#83859B',
4: '#565970',
5: '#383849',
6: '#000000',
},
highlights: {
1: '#75B4C0',
2: '#6CCBB4',
3: '#32936F',
4: '#DD403A',
5: '#BB3F3C',
6: '#FFC077',
},
alternate: {
1: '#FDF2DF',
2: '#F8C67E',
3: '#F28F00',
4: '#E0F1EE',
5: '#59B19B',
6: '#2C8F75',
},
light: '#F9F9FA',
dark: '#1F201F',
},
fontFamily: {
sans: ['var(--font-sans)', 'Roboto', 'sans-serif'],
display: ['var(--font-display)', 'Jost', 'Roboto', 'sans-serif'],
display: ['var(--font-display)', 'Jost', 'Roboto', 'sans-serif', 'Montserrat'],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The font Montserrat is never loaded because it's not being imported in the _app.tsx file. Instead of putting this here, update the font corresponding to --font-display in _app.tsx.

},
fontSize: {
headline1: [
'96px',
'display-extra-large': [
'86px',
{
letterSpacing: '-1.5px',
fontFamily: 'Jost',
fontWeight: 800,
lineHeight: 1.24,
letterSpacing: '-1px',
},
],
headline2: [
'60px',
'display-large': [
'84px',
{
letterSpacing: '-0.5px',
fontFamily: 'Jost',
fontWeight: 300,
lineHeight: 1.21,
letterSpacing: '-1.25px',
},
],
headline3: [
'48px',
'title-large': [
'64px',
{
letterSpacing: '0px',
fontFamily: 'Jost',
fontWeight: 500,
lineHeight: 0.87,
letterSpacing: '-1.25px',
},
],
headline4: [
'34px',
'title-medium': [
'50px',
{
letterSpacing: '0.25px',
fontFamily: 'Jost',
fontWeight: 400,
lineHeight: 0.72,
letterSpacing: '-1.25px',
},
],

headline5: [
'24px',
'body-title': [
'34px',
{
letterSpacing: '0px',
fontFamily: 'Jost',
fontWeight: 600,
lineHeight: 0.49,
letterSpacing: '-1.25px',
},
],

headline6: [
'20px',
'footer-title': [
'18px',
{
letterSpacing: '0.15px',
fontFamily: 'Jost',
fontWeight: 500,
lineHeight: 0.26,
letterSpacing: '0px',
},
],
subtitle1: [
'16px',
'title-emphasis-large': [
'24px',
{
letterSpacing: '0.15px',
fontFamily: 'Montserrat',
fontWeight: 700,
lineHeight: 0.29,
letterSpacing: '-0.5px',
},
],
subtitle2: [
'14px',
'title-content-large': [
'24px',
{
letterSpacing: '0.1px',
fontFamily: 'Montserrat',
fontWeight: 400,
lineHeight: 0.29,
letterSpacing: '-0.5px',
},
],
body1: [
'16px',
'body-content': [
'20px',
{
letterSpacing: '0.5px',
fontFamily: 'Montserrat',
fontWeight: 500,
lineHeight: 0.29,
letterSpacing: '0px',
},
],
body2: [
'14px',
'subheading-content': [
'20px',
{
letterSpacing: '0.25px',
fontFamily: 'Jost',
fontWeight: 500,
lineHeight: 0.29,
letterSpacing: '0px',
},
],
button: [
'footer-content': [
'14px',
{
letterSpacing: '1.25px',
},
],
caption: [
'12px',
{
letterSpacing: '0.4px',
},
],
overline: [
'10px',
{
letterSpacing: '1.5px',
fontFamily: 'Jost',
fontWeight: 500,
lineHeight: 0.2,
letterSpacing: '-0px',
},
],
},
Expand Down