Skip to content

Commit 42de3da

Browse files
committed
fixed duplicate global file and seperated fonts
1 parent 692fc0e commit 42de3da

File tree

5 files changed

+93
-141
lines changed

5 files changed

+93
-141
lines changed

src/assets/styles/custom-font.css

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/assets/styles/custom-fonts.css

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/* src/styles/custom-font.css */
2+
@supports font-format(woff2) {
3+
@font-face {
4+
font-family: "sportrop";
5+
src: url("/fonts/sportrop-webfont.woff2") format("woff2"),
6+
url("/fonts/sportrop-webfont.woff") format("woff");
7+
font-weight: normal;
8+
font-style: normal;
9+
font-display: swap;
10+
}
11+
12+
@font-face {
13+
font-family: "atkinson";
14+
src: url("/fonts/atkinson-hyperlegible-regular-102-webfont.woff2") format("woff2"),
15+
url("/fonts/atkinson-hyperlegible-regular-102-webfont.woff") format("woff");
16+
font-weight: normal;
17+
font-style: normal;
18+
font-display: swap;
19+
}
20+
21+
@font-face {
22+
font-family: "Mudra";
23+
src: url("/fonts/MudraMohta-Regular.ttf") format("truetype");
24+
font-weight: normal;
25+
font-style: normal;
26+
}
27+
}
28+
29+
@font-face {
30+
font-family: "boisuStroke";
31+
src: url("/fonts/Boisu-Stroke.otf") format("otf");
32+
font-weight: normal;
33+
font-style: normal;
34+
font-display: swap;
35+
}
36+
37+
@font-face {
38+
font-family: "Roboto";
39+
src: url("/fonts/Roboto-Bold.ttf") format("ttf");
40+
font-weight: normal;
41+
font-style: normal;
42+
font-display: swap;
43+
}

src/assets/styles/global.css

Lines changed: 0 additions & 130 deletions
This file was deleted.

src/assets/styles/globals.css

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "./custom-font.css";
1+
@import "./custom-fonts.css";
22
@tailwind base;
33
@tailwind components;
44
@tailwind utilities;
@@ -11,12 +11,13 @@
1111
--font-ratio-max: 1.33;
1212
--font-width-min: 375;
1313
--font-width-max: 1500;
14+
--header-h: 6rem;
15+
--footer-h: 4rem;
1416
}
1517

1618
html {
1719
color-scheme: light dark;
1820
height: 100%;
19-
font-family: "Mudra";
2021
}
2122

2223
[data-theme="light"] {
@@ -40,6 +41,7 @@
4041
min-height: 100vh;
4142
font-family: "Roboto", "SF Pro Text", "SF Pro Icons", "AOS Icons", "Helvetica Neue", Helvetica, Arial, sans-serif,
4243
system-ui;
44+
font-size: 16px;
4345
}
4446

4547
body::before {
@@ -62,12 +64,47 @@
6264
opacity: 1;
6365
}
6466

67+
.container {
68+
display: grid;
69+
grid-auto-flow: row;
70+
grid-template-rows: var(--header-h) 1fr var(--footer-h);
71+
grid-template-areas: "header" "main" "footer";
72+
grid-gap: 0.25rem;
73+
}
74+
75+
header {
76+
grid-area: header;
77+
height: var(--header-h);
78+
border: 1px solid pink;
79+
display: flex;
80+
justify-content: space-between;
81+
align-items: center;
82+
padding-inline: 1rem;
83+
}
84+
85+
a {
86+
color: light-dark(#151414, white);
87+
}
88+
89+
h1 {
90+
font-size: 3rem;
91+
font-weight: 700;
92+
line-height: 1;
93+
text-align: center;
94+
font-family: Roboto;
95+
}
96+
6597
main {
6698
display: grid;
6799
gap: 4px;
68100
grid-template-columns: 20rem 1fr;
69101
grid-auto-flow: column;
70102
grid-template-areas: "sidebar content";
103+
padding: 1rem;
104+
font-size: 1.25rem;
105+
line-height: 1.6;
106+
max-height: calc(100vh - var(--header-h) - var(--footer-h) - 4rem);
107+
height: 100vh;
71108

72109
&.sidebar {
73110
grid-area: sidebar;
@@ -78,6 +115,15 @@
78115
}
79116
}
80117

118+
footer {
119+
grid-area: footer;
120+
padding-inline: 1rem;
121+
margin-block: 0.5rem;
122+
height: var(--footer-h);
123+
display: flex;
124+
align-items: center;
125+
}
126+
81127
@container thread (max-width: 768px) {
82128
main {
83129
grid-template-areas: "content";
@@ -111,4 +157,4 @@
111157
.text__active {
112158
@apply text-customLight-active dark:text-customDark-active;
113159
}
114-
}
160+
}

src/assets/styles/page-header.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url(./global.css);
1+
@import url(./globals.css);
22

33
.header {
44
background-color: #15091d;

0 commit comments

Comments
 (0)