-
Notifications
You must be signed in to change notification settings - Fork 1
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
98 styling setup #113
Merged
+511
−36
Merged
98 styling setup #113
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
47dd089
start setting up tailwind
sigridge c672d6e
Add font families
mathildehaugum 3d78f67
Add fonts to global css
mathildehaugum d773aed
Add import of global css
mathildehaugum 32308e1
Remove unused tailwind config
mathildehaugum e0b4e5a
Add tailwind to project
mathildehaugum 50dac4c
Update tailwind imports
mathildehaugum 4154d84
Change to src in path
mathildehaugum File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
module.exports = { | ||
plugins: { | ||
tailwindcss: {}, | ||
autoprefixer: {}, | ||
}, | ||
} |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,102 @@ | ||
@tailwind base; | ||
@tailwind components; | ||
@tailwind utilities; | ||
|
||
@font-face { | ||
font-family: "Graphik-Medium"; | ||
src: url("https://anima-uploads.s3.amazonaws.com/projects/632da9fa4f45dc45af16fa8d/fonts/graphik-medium.otf") | ||
format("opentype"); | ||
font-family: "Recoleta-Regular"; | ||
src: url(../../public/fonts/recoleta-regular.woff) format("truetype"); | ||
} | ||
|
||
@font-face { | ||
font-family: "Recoleta-Medium"; | ||
src: url(../../public/fonts/recoleta-medium.woff) format("truetype"); | ||
} | ||
|
||
@font-face { | ||
font-family: "Graphik-Regular"; | ||
src: url("https://anima-uploads.s3.amazonaws.com/projects/632da9fa4f45dc45af16fa8d/fonts/graphik-regular.otf") | ||
format("opentype"); | ||
src: url(../../public/fonts/Graphik-Regular-Web.woff2) format("truetype"); | ||
} | ||
|
||
@font-face { | ||
font-family: "Graphik-Medium"; | ||
src: url(../../public/fonts/Graphik-Medium-Web.woff2) format("truetype"); | ||
} | ||
|
||
/* TODO: Fix CSP or remove completely */ | ||
@font-face { | ||
font-family: "Arial-Bold"; | ||
src: url("https://anima-uploads.s3.amazonaws.com/projects/622cf300b3519bff6181cd8f/fonts/fontsfree-net-arial-bold.ttf") | ||
format("truetype"); | ||
} | ||
font-family: "Graphik-Semibold"; | ||
src: url(../../public/fonts/Graphik-Semibold-Web.woff2) format("truetype"); | ||
} | ||
|
||
@font-face { | ||
font-family: "Graphik-Bold"; | ||
src: url(../../public/fonts/Graphik-Bold-Web.woff2) format("truetype"); | ||
} | ||
|
||
@layer components { | ||
} | ||
|
||
@layer utilities { | ||
body { | ||
background-color: #ffffff; | ||
} | ||
|
||
h1 { | ||
font-size: 2rem; | ||
font-family: "Recoletta-Regular"; | ||
line-height: 2.5rem; | ||
} | ||
|
||
h2 { | ||
font-size: 1.625rem; | ||
font-family: "Graphik-Regular"; | ||
line-height: 2.5rem; | ||
} | ||
|
||
h3 { | ||
font-size: 1.25rem; | ||
font-family: "Graphik-Regular"; | ||
line-height: 2.5rem; | ||
} | ||
|
||
.body { | ||
font-size: 0.9rem; | ||
font-family: "Graphik-Regular"; | ||
line-height: 1rem; | ||
} | ||
|
||
.body-bold { | ||
font-size: 0.9rem; | ||
font-family: "Graphik-SemiBold"; | ||
line-height: 1rem; | ||
} | ||
|
||
.body-small { | ||
font-size: 0.75rem; | ||
font-family: "Graphik-Regular"; | ||
line-height: 1rem; | ||
} | ||
|
||
.body-small-bold { | ||
font-size: 0.75rem; | ||
font-family: "Graphik-Medium"; | ||
line-height: 1rem; | ||
} | ||
|
||
.detail { | ||
font-size: 0.625rem; | ||
font-family: "Graphik-Regular"; | ||
line-height: 1rem; | ||
} | ||
|
||
.body-large { | ||
font-size: 1rem; | ||
font-family: "Graphik-Regular"; | ||
line-height: 1.25rem; | ||
} | ||
|
||
.body-large-bold { | ||
font-size: 1rem; | ||
font-family: "Graphik-Medium"; | ||
line-height: 1.25rem; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,24 @@ | ||
import Head from 'next/head'; | ||
import AppProviders from '../components/AppProviders'; | ||
|
||
export default function RootLayout({ children }: { children: React.ReactNode }) { | ||
return ( | ||
<html> | ||
<Head> | ||
<title>Vibes Frontend</title> | ||
<meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" /> | ||
</Head> | ||
<body> | ||
<AppProviders> {children}</AppProviders> | ||
</body> | ||
</html> | ||
); | ||
import "./globals.css"; | ||
import Head from "next/head"; | ||
import AppProviders from "../components/AppProviders"; | ||
|
||
export default function RootLayout({ | ||
children, | ||
}: { | ||
children: React.ReactNode; | ||
}) { | ||
return ( | ||
<html> | ||
<Head> | ||
<title>Vibes Frontend</title> | ||
<meta | ||
name="viewport" | ||
content="minimum-scale=1, initial-scale=1, width=device-width" | ||
/> | ||
</Head> | ||
<body> | ||
<AppProviders> {children}</AppProviders> | ||
</body> | ||
</html> | ||
); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/** @type {import('tailwindcss').Config} */ | ||
module.exports = { | ||
content: ["./src/**/*.{js,jsx,ts,tsx}"], | ||
theme: { | ||
colors: { | ||
black: "#000000", | ||
white: "#FFFFFF", | ||
primary_default: "#423D89", | ||
primary_l3: "#ECECF3", | ||
secondary_default: "#F076A6", | ||
}, | ||
extend: {}, | ||
screens: { | ||
xs: "640px", | ||
sm: "768px", | ||
md: "1024px", | ||
lg: "1280px", | ||
xl: "1400px", | ||
}, | ||
}, | ||
plugins: [], | ||
}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Veldig bra vi bruker assets her. Forenkler mye mer enn CDN, CSP setup (som jeg kranglet med tidligere) m.m. 🎉 👏 👏