Skip to content

Commit 6901c2a

Browse files
authored
Merge pull request #32 from khaykingleb/use-different-font
feat(font): use gill-sans
2 parents c8d5420 + c741fc3 commit 6901c2a

11 files changed

+48
-60
lines changed

app/components/atoms/Copyright.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export const Copyright = () => {
22
return (
3-
<div className="mb-2 text-center">
3+
<div className="font-gill-sans-regular mb-2 text-center">
44
<p>&copy; 2024 Gleb Khaykin</p>
55
</div>
66
);

app/components/molecules/MenuItems.tsx

+4-10
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ import { Link } from "@remix-run/react";
22

33
export const MenuItems = () => {
44
return (
5-
<ul className="menu menu-horizontal menu-md text-white">
5+
<ul className="menu menu-horizontal menu-md">
66
<li>
7-
<Link
8-
to="/blog"
9-
className="font-eb-garamond-black btn btn-ghost text-base sm:text-xl"
10-
>
7+
<Link to="/blog" className="btn btn-ghost text-xl sm:text-2xl">
118
Blog
129
</Link>
1310
</li>
@@ -16,16 +13,13 @@ export const MenuItems = () => {
1613
to="/Gleb_Khaykin.pdf"
1714
prefetch="intent"
1815
target="_blank"
19-
className="font-eb-garamond-black btn btn-ghost text-base sm:text-xl"
16+
className="btn btn-ghost text-xl sm:text-2xl"
2017
>
2118
CV
2219
</Link>
2320
</li>
2421
<li>
25-
<Link
26-
to="/"
27-
className="font-eb-garamond-black btn btn-ghost text-base sm:text-xl"
28-
>
22+
<Link to="/" className="btn btn-ghost text-xl sm:text-2xl">
2923
About
3024
</Link>
3125
</li>

app/components/molecules/MobileMenuItems.tsx

+5-11
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@ import { IoMdMenu } from "react-icons/io";
44
export const MobileMenuItems = () => (
55
<details className="dropdown dropdown-end">
66
<summary className="btn btn-circle btn-ghost">
7-
<IoMdMenu className="h-6 w-6 text-white" />
7+
<IoMdMenu className="h-6 w-6" />
88
</summary>
9-
<ul className="menu dropdown-content absolute right-0 z-[1] mt-2 w-28 rounded-lg bg-white shadow-lg">
9+
<ul className="menu dropdown-content absolute right-0 z-[1] mt-2 w-28 rounded-lg bg-white text-black shadow-lg">
1010
<li>
11-
<Link
12-
to="/blog"
13-
className="font-eb-garamond-bold btn btn-ghost text-base hover:bg-gray-100"
14-
>
11+
<Link to="/blog" className="btn btn-ghost text-base hover:bg-gray-100">
1512
Blog
1613
</Link>
1714
</li>
@@ -21,17 +18,14 @@ export const MobileMenuItems = () => (
2118
to="/Gleb_Khaykin.pdf"
2219
prefetch="intent"
2320
target="_blank"
24-
className="font-eb-garamond-bold btn btn-ghost text-base hover:bg-gray-100"
21+
className="btn btn-ghost text-base hover:bg-gray-100"
2522
>
2623
CV
2724
</Link>
2825
</li>
2926
<hr className="my-1 border-t border-gray-200" />
3027
<li>
31-
<Link
32-
to="/"
33-
className="font-eb-garamond-bold btn btn-ghost text-base hover:bg-gray-100"
34-
>
28+
<Link to="/" className="btn btn-ghost text-base hover:bg-gray-100">
3529
About
3630
</Link>
3731
</li>

app/components/molecules/TagSearchBar.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ const TextInput = ({
2424
}: TextInputProps) => {
2525
return (
2626
<div className="relative">
27-
<FaSearch className="absolute left-1 top-1/2 -translate-y-1/2 text-gray-400" />
27+
<FaSearch className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
2828
<input
2929
type="text"
3030
value={value}
3131
onChange={onChange}
3232
placeholder={placeholder}
3333
onFocus={onFocus}
34-
className="input input-bordered h-8 w-full pl-6 pr-6 text-sm"
34+
className="input input-bordered left-3 h-8 w-full pl-8 pr-6 text-sm"
3535
/>
3636
{value && (
3737
<button
@@ -70,7 +70,7 @@ const TagItem = ({ name, onClick, checked, isFocused }: TagItemProps) => {
7070
>
7171
{checked && <FaCheck className="text-xs text-white" />}
7272
</span>
73-
<span className="text-sm font-medium">{name}</span>
73+
<span className="font-gill-sans-regular text-sm">{name}</span>
7474
</div>
7575
);
7676
};
@@ -191,7 +191,7 @@ export const TagSearchBar = ({
191191

192192
return (
193193
<div
194-
className="font-eb-garamond-light relative mx-auto mt-6 w-full max-w-xs"
194+
className="font-gill-sans-light relative mx-auto mt-6 w-full max-w-xs"
195195
ref={TagSearchBarRef}
196196
onKeyDown={handleKeyDown}
197197
role="combobox"

app/components/organisms/Carousel.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Post } from "~/data/posts";
44

55
export const Carousel = ({ items }: { items: Post[] }) => {
66
return (
7-
<div className="mb-2 mt-2 w-full max-w-2xl">
7+
<div className="mb-2 mt-2">
88
{items.length > 0 ? (
99
<div className="carousel carousel-vertical h-full w-full">
1010
{items.map((item) => (
@@ -14,13 +14,13 @@ export const Carousel = ({ items }: { items: Post[] }) => {
1414
className="carousel-item block w-full cursor-pointer transition-all duration-300 hover:bg-gray-100"
1515
>
1616
<div className="w-full p-3">
17-
<h2 className="font-eb-garamond-black mb-1 text-lg font-bold">
17+
<h2 className="font-gill-sans-semibold mb-1 text-lg">
1818
{item.title}
1919
</h2>
20-
<p className="font-eb-garamond-light mb-2 text-sm">
20+
<p className="font-gill-sans-light mb-2 text-sm">
2121
Created at {item.publishDate.replace(/-/g, "/")}
2222
</p>
23-
<div className="font-eb-garamond-light">
23+
<div className="font-gill-sans-regular">
2424
{item.tags.map((tag) => (
2525
<span
2626
key={tag}
@@ -36,7 +36,7 @@ export const Carousel = ({ items }: { items: Post[] }) => {
3636
</div>
3737
) : (
3838
<div className="pt-52 text-center">
39-
<p className="font-eb-garamond-bold text-xl">No posts found</p>
39+
<p className="font-gill-sans-bold text-xl">No posts found</p>
4040
</div>
4141
)}
4242
</div>

app/components/organisms/Header.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@ interface HeaderProps {
77

88
export const Header = ({ backgroundImage }: HeaderProps) => {
99
return (
10-
<header className="relative flex h-16 items-center px-4 sm:px-6 lg:px-8">
10+
<header className="h-18 relative flex items-center px-4 sm:px-6 lg:px-8">
1111
<div
1212
className="absolute inset-0 bg-cover bg-center"
1313
style={{
1414
backgroundImage: `url(${backgroundImage})`,
1515
}}
1616
></div>
1717
<div className="absolute inset-0 bg-gradient-to-b from-black/20 to-black/20"></div>
18-
<div className="relative z-10 mx-auto flex w-full max-w-[700px] items-center justify-between">
19-
<span className="font-eb-garamond-black text-xl text-white sm:text-2xl">
20-
~/khaykingleb
21-
</span>
18+
<div className="font-gill-sans-bold relative z-10 mx-auto flex w-full max-w-[800px] items-center justify-between text-white">
19+
<span className="text-xl sm:text-2xl">~/khaykingleb</span>
2220
<nav className="hidden sm:block">
2321
<MenuItems />
2422
</nav>

app/routes/_index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function IndexRoute() {
3535
<Avatar />
3636
</div>
3737
<div className="flex-grow">
38-
<div className="font-eb-garamond-light mx-auto max-w-[500px] px-4 text-center text-sm sm:text-base">
38+
<div className="font-gill-sans-regular mx-auto max-w-[550px] px-4 text-center text-sm sm:text-base">
3939
<p className="mb-3">
4040
Hi there! I&apos;m Gleb, a full-stack developer specializing in
4141
DevOps and MLOps engineering. My background includes distributed

app/routes/blog.$slug.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export default function BlogPostRoute() {
153153
<div className="flex min-h-screen flex-col">
154154
<Header backgroundImage="/img/van_gogh_wheatfield_with_crows.jpg" />
155155
<main className="flex-grow px-4 sm:px-6 lg:px-8">
156-
<div className="mx-auto flex min-h-[calc(100vh-4rem-6rem)] max-w-[700px] flex-col">
156+
<div className="mx-auto flex min-h-[calc(100vh-4rem-6rem)] max-w-[800px] flex-col">
157157
<Suspense fallback={<LoadingSpinner />}>
158158
<Await resolve={recordMap}>
159159
{(resolvedRecordMap: ExtendedRecordMap) => {

app/routes/blog._index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export default function BlogRoute() {
8989
<div className="flex min-h-screen flex-col">
9090
<Header backgroundImage="/img/van_gogh_wheatfield_with_crows.jpg" />
9191
<main className="flex flex-grow flex-col px-4 sm:px-6 lg:px-8">
92-
<div className="mx-auto flex h-full w-full max-w-[700px] flex-grow flex-col">
92+
<div className="mx-auto flex h-full w-full max-w-[800px] flex-grow flex-col">
9393
<TagSearchBar tagOptions={tagOptions} setTagOptions={setTagOptions} />
9494
<div className="flex-grow">
9595
<Carousel

app/styles/notion.css

+4-6
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
@tailwind utilities;
1414

1515
@layer utilities {
16-
.font-eb-garamond-regular {
17-
font-family: "EB Garamond", serif;
16+
.font-gill-sans {
17+
font-family: "Gill Sans", serif;
1818
}
1919
}
2020

@@ -24,7 +24,7 @@
2424

2525
.notion-title,
2626
.notion-asset-caption {
27-
@apply font-eb-garamond-regular text-center;
27+
@apply font-gill-sans text-center;
2828
}
2929

3030
.notion-table-of-contents,
@@ -33,9 +33,7 @@
3333
.notion-h3,
3434
.notion-list,
3535
.notion-text {
36-
@apply font-eb-garamond-regular;
37-
38-
max-width: 100%;
36+
@apply font-gill-sans;
3937
}
4038

4139
.notion-title {

app/styles/tailwind.css

+19-15
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,47 @@
1-
@import url("https://fonts.googleapis.com/css2?family=EB+Garamond:ital,wght@0,400..800;1,400..800");
2-
31
@tailwind base;
42
@tailwind components;
53
@tailwind utilities;
64

75
@layer utilities {
8-
.font-eb-garamond-thin {
9-
font-family: "EB Garamond", serif;
6+
.font-gill-sans-thin {
7+
font-family: "Gill Sans", sans-serif;
108
font-weight: 100;
119
font-style: normal;
1210
}
1311

14-
.font-eb-garamond-light {
15-
font-family: "EB Garamond", serif;
12+
.font-gill-sans-light {
13+
font-family: "Gill Sans", sans-serif;
1614
font-weight: 300;
1715
font-style: normal;
1816
}
1917

20-
.font-eb-garamond-regular {
21-
font-family: "EB Garamond", serif;
18+
.font-gill-sans-regular {
19+
font-family: "Gill Sans", sans-serif;
2220
font-weight: 400;
2321
font-style: normal;
2422
}
2523

26-
.font-eb-garamond-medium {
27-
font-family: "EB Garamond", serif;
24+
.font-gill-sans-medium {
25+
font-family: "Gill Sans", sans-serif;
2826
font-weight: 500;
2927
font-style: normal;
3028
}
3129

32-
.font-eb-garamond-bold {
33-
font-family: "EB Garamond", serif;
30+
.font-gill-sans-semibold {
31+
font-family: "Gill Sans", sans-serif;
32+
font-weight: 600;
33+
font-style: normal;
34+
}
35+
36+
.font-gill-sans-bold {
37+
font-family: "Gill Sans", sans-serif;
3438
font-weight: 700;
3539
font-style: normal;
3640
}
3741

38-
.font-eb-garamond-black {
39-
font-family: "EB Garamond", serif;
40-
font-weight: 900;
42+
.font-gill-sans-extrabold {
43+
font-family: "Gill Sans", sans-serif;
44+
font-weight: 800;
4145
font-style: normal;
4246
}
4347
}

0 commit comments

Comments
 (0)