Skip to content

Commit 95703b4

Browse files
NoelDeMartinNoelDeMartin
committed
Clean up CSS and fonts
1 parent c30d59a commit 95703b4

15 files changed

+115
-40
lines changed

‎content/collections/pages/home.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ These are my values:
6161

6262
</div>
6363

64-
<div class="relative flex flex-grow self-stretch justify-center mb-4 md:mb-0 md:ml-4">
64+
<div class="relative flex grow self-stretch justify-center mb-4 md:mb-0 md:ml-4">
6565
<div class="flex items-center justify-center w-32 h-32 md:absolute md:inset-0 md:m-8 md:w-auto md:h-auto">
6666
{{ partial:icons/my-values class="w-full" }}
6767
</div>
@@ -73,7 +73,7 @@ These are my values:
7373

7474
<div class="flex flex-col w-full md:flex-row">
7575

76-
<div class="relative flex flex-grow self-stretch justify-center mb-4 md:mb-0 md:mr-4">
76+
<div class="relative flex grow self-stretch justify-center mb-4 md:mb-0 md:mr-4">
7777
<div class="flex items-center justify-center w-32 h-32 md:absolute md:inset-0 md:m-8 md:w-auto md:h-auto">
7878
{{ partial:icons/my-background class="w-full" }}
7979
</div>
@@ -109,7 +109,7 @@ On occasion I like going for a hike, and I love traveling and learning about oth
109109

110110
</div>
111111

112-
<div class="relative flex flex-grow self-stretch justify-center mb-4 md:mb-0 md:ml-4">
112+
<div class="relative flex grow self-stretch justify-center mb-4 md:mb-0 md:ml-4">
113113
<div class="flex items-center justify-center w-32 h-32 md:absolute md:inset-0 md:m-8 md:w-auto md:h-auto">
114114
{{ partial:icons/beyond-the-code class="w-full" }}
115115
</div>

‎please

-20
This file was deleted.

‎resources/css/base.css

-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
1-
html {
2-
@apply font-ubuntu text-black-light text-base leading-tight font-normal;
3-
}
4-
5-
body {
6-
@apply flex min-h-screen flex-col;
7-
}
8-
91
main {
10-
@apply w-full flex-grow;
11-
122
a {
133
@apply underline;
144

@@ -107,10 +97,6 @@ main {
10797

10898
/* Print */
10999
@media print {
110-
body {
111-
@apply block;
112-
}
113-
114100
p,
115101
li {
116102
page-break-inside: avoid;

‎resources/css/fonts.css

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
@font-face {
2+
font-family: 'Ubuntu';
3+
font-style: normal;
4+
font-weight: 400;
5+
src:
6+
local('Ubuntu Regular'),
7+
local('Ubuntu-Regular'),
8+
url('../fonts/Ubuntu_Latin.woff2') format('woff2');
9+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6,
10+
U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
11+
U+2212, U+2215, U+FEFF, U+FFFD;
12+
}
13+
14+
@font-face {
15+
font-family: 'Ubuntu';
16+
font-style: normal;
17+
font-weight: 400;
18+
src:
19+
local('Ubuntu Regular'),
20+
local('Ubuntu-Regular'),
21+
url('../fonts/Ubuntu_Latin_Ext.woff2') format('woff2');
22+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
23+
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
24+
}
25+
26+
@font-face {
27+
font-family: 'Ubuntu';
28+
font-style: normal;
29+
font-weight: 500;
30+
src:
31+
local('Ubuntu Medium'),
32+
local('Ubuntu-Medium'),
33+
url('../fonts/Ubuntu_Medium_Latin.woff2') format('woff2');
34+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6,
35+
U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
36+
U+2212, U+2215, U+FEFF, U+FFFD;
37+
}
38+
39+
@font-face {
40+
font-family: 'Ubuntu';
41+
font-style: normal;
42+
font-weight: 500;
43+
src:
44+
local('Ubuntu Medium'),
45+
local('Ubuntu-Medium'),
46+
url('../fonts/Ubuntu_Medium_Latin_Ext.woff2') format('woff2');
47+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
48+
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
49+
}
50+
51+
@font-face {
52+
font-family: 'Ubuntu';
53+
font-style: normal;
54+
font-weight: 700;
55+
src:
56+
local('Ubuntu Bold'),
57+
local('Ubuntu-Bold'),
58+
url('../fonts/Ubuntu_Bold_Latin.woff2') format('woff2');
59+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6,
60+
U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
61+
U+2212, U+2215, U+FEFF, U+FFFD;
62+
}
63+
64+
@font-face {
65+
font-family: 'Ubuntu';
66+
font-style: normal;
67+
font-weight: 700;
68+
src:
69+
local('Ubuntu Bold'),
70+
local('Ubuntu-Bold'),
71+
url('../fonts/Ubuntu_Bold_Latin_Ext.woff2') format('woff2');
72+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
73+
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
74+
}
75+
76+
@font-face {
77+
font-family: 'Ubuntu Mono';
78+
font-style: normal;
79+
font-weight: 400;
80+
src:
81+
local('Ubuntu Mono'),
82+
local('UbuntuMono-Regular'),
83+
url('../fonts/Ubuntu_Mono_Latin.woff2') format('woff2');
84+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6,
85+
U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
86+
U+2212, U+2215, U+FEFF, U+FFFD;
87+
}
88+
89+
@font-face {
90+
font-family: 'Ubuntu Mono';
91+
font-style: normal;
92+
font-weight: 400;
93+
src:
94+
local('Ubuntu Mono'),
95+
local('UbuntuMono-Regular'),
96+
url('../fonts/Ubuntu_Mono_Latin_Ext.woff2') format('woff2');
97+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
98+
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
99+
}

‎resources/css/main.css

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77

88
@layer base {
99
@import './base.css';
10+
@import './fonts.css';
1011
}

‎public/fonts/Ubuntu_Bold_Latin.woff2 renamed to ‎resources/fonts/Ubuntu_Bold_Latin.woff2

File renamed without changes.

‎public/fonts/Ubuntu_Bold_Latin_Ext.woff2 renamed to ‎resources/fonts/Ubuntu_Bold_Latin_Ext.woff2

File renamed without changes.

‎public/fonts/Ubuntu_Latin.woff2 renamed to ‎resources/fonts/Ubuntu_Latin.woff2

File renamed without changes.

‎public/fonts/Ubuntu_Latin_Ext.woff2 renamed to ‎resources/fonts/Ubuntu_Latin_Ext.woff2

File renamed without changes.

‎public/fonts/Ubuntu_Medium_Latin.woff2 renamed to ‎resources/fonts/Ubuntu_Medium_Latin.woff2

File renamed without changes.

‎public/fonts/Ubuntu_Medium_Latin_Ext.woff2 renamed to ‎resources/fonts/Ubuntu_Medium_Latin_Ext.woff2

File renamed without changes.

‎public/fonts/Ubuntu_Mono_Latin.woff2 renamed to ‎resources/fonts/Ubuntu_Mono_Latin.woff2

File renamed without changes.

‎public/fonts/Ubuntu_Mono_Latin_Ext.woff2 renamed to ‎resources/fonts/Ubuntu_Mono_Latin_Ext.woff2

File renamed without changes.

‎resources/views/blog/show.blade.php

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
@extends('layout')
22

3+
{{--
4+
TODO minimal => true
5+
TODO code highlighter
6+
TODO landmarks / navigation
7+
--}}
8+
39
@section('main')
410
<article>
511
<div class="max-w-readable overflow-hidden">

‎resources/views/layout.blade.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="{{ $site->short_locale }}" class="h-full w-full">
2+
<html lang="{{ $site->short_locale }}">
33
<head>
44
<meta charset="utf-8" />
55
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -8,7 +8,7 @@
88
@vite(["resources/css/main.css"])
99
</head>
1010
<body
11-
class="h-full w-full bg-white font-sans text-base leading-normal font-normal text-gray-800 antialiased"
11+
class="font-ubuntu text-black-light flex min-h-screen flex-col bg-white text-base leading-tight font-normal antialiased print:block"
1212
>
1313
<a
1414
href="#main"
@@ -69,7 +69,10 @@ class="border-b-2 border-transparent group-hover:border-black [[aria-current]>&]
6969
</nav>
7070
</header>
7171

72-
<main id="main" class="max-w-content relative mx-auto p-4 pt-8 md:px-2">
72+
<main
73+
id="main"
74+
class="max-w-content relative mx-auto w-full grow p-4 pt-8 md:px-2"
75+
>
7376
@yield("main")
7477
</main>
7578

0 commit comments

Comments
 (0)