Skip to content

Commit 07f6cd7

Browse files
committed
Updated browserslist, added new fonts to Tailwind config and layout, and applied fonts to dashboard and landing pages
1 parent 127a0c7 commit 07f6cd7

File tree

7 files changed

+135
-89
lines changed

7 files changed

+135
-89
lines changed

package-lock.json

Lines changed: 91 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"sqlite3": "^5.1.7"
1919
},
2020
"devDependencies": {
21-
"browserlist": "^1.0.1",
21+
"browserslist": "^4.23.0",
2222
"tailwindcss": "^3.4.17"
2323
}
2424
}

public/stylesheets/output.css

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,8 +934,12 @@ video {
934934
font-family: Inter, sans-serif;
935935
}
936936

937-
.font-monserrat {
938-
font-family: Monserrat, sans-serif;
937+
.font-montserrat {
938+
font-family: Montserrat, sans-serif;
939+
}
940+
941+
.font-nunito {
942+
font-family: Nunito, sans-serif;
939943
}
940944

941945
.font-raleway {
@@ -967,6 +971,11 @@ video {
967971
line-height: 1.75rem;
968972
}
969973

974+
.text-3xl {
975+
font-size: 1.875rem;
976+
line-height: 2.25rem;
977+
}
978+
970979
.font-bold {
971980
font-weight: 700;
972981
}
@@ -1152,6 +1161,11 @@ video {
11521161
font-size: 1.25rem;
11531162
line-height: 1.75rem;
11541163
}
1164+
1165+
.md\:text-3xl {
1166+
font-size: 1.875rem;
1167+
line-height: 2.25rem;
1168+
}
11551169
}
11561170

11571171
@media (min-width: 1024px) {

tailwind.config.js

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
/** @type {import('tailwindcss').Config} */
22
module.exports = {
3-
content: [
4-
"./views/**/*.hbs",
5-
"./public/**/*.js"
6-
],
3+
content: ["./views/**/*.hbs", "./public/**/*.js"],
74
theme: {
85
extend: {
9-
colors:{
10-
titlleColor:'#1c398e',
11-
iconColor: '#2563eb',
12-
welcomeColor: '#1c398e !important'
6+
colors: {
7+
titlleColor: "#1c398e",
8+
iconColor: "#2563eb",
9+
welcomeColor: "#1c398e !important",
10+
},
11+
fontFamily: {
12+
montserrat: ["Montserrat", "sans-serif"],
13+
playfair: ["Playfair Display", "serif"],
14+
poppins: ["Poppins", "sans-serif"],
15+
merriweather: ["Merriweather", "serif"],
16+
inter: ["Inter", "sans-serif"],
17+
roboto: ["Roboto", "sans-serif"],
18+
nunito: ["Nunito", "sans-serif"],
19+
raleway: ["Raleway", "sans-serif"],
20+
lato: ["Lato", "sans-serif"],
21+
quicksand: ["Quicksand", "sans-serif"],
22+
sourcesans: ["Source Sans 3", "sans-serif"],
23+
barlow: ["Barlow", "sans-serif"],
24+
marhey: ["Marhey", "cursive"],
25+
baloo2: ["Baloo 2", "cursive"],
1326
},
14-
fontFamily:{
15-
monserrat: ['Monserrat', 'sans-serif'],
16-
playfair: ['Playfair Display', 'serif'],
17-
poppins: ['Poppins', 'sans-serif'],
18-
merriweather: ['Merriweather', 'serif'],
19-
inter: ['Inter', 'sans-serif'],
20-
roboto: ['Roboto', 'sans-serif'],
21-
nunito: ['Nunito', 'sans-serif'],
22-
raleway: ['Raleway', 'sans-serif'],
23-
lato: ['Lato', 'sans-serif'],
24-
quicksand: ['Quicksand', 'sans-serif'],
25-
sourcesans: ['Source Sans 3', 'sans-serif'],
26-
barlow: ['Barlow', 'sans-serif'],
27-
}
2827
},
2928
},
3029
plugins: [],
31-
}
30+
};
3231

views/dashboard.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Header -->
33
<header class="bg-gradient-to-br from-blue-100 to-blue-300 mx-auto w-full py-6 shadow text-blue-900">
44
<div class="container mx-auto flex justify-between items-center px-4">
5-
<h1 class="text-2xl font-bold text-titleColor font-monserrat">{{title}}</h1>
5+
<h1 class="text-3xl md:text-3xl text-titleColor font-bold font-nunito">{{title}}</h1>
66
<!-- Hamburger Button (Mobile) -->
77
<button id="menuBtn" class="md:hidden p-2 rounded focus:outline-none focus:ring-2 focus:ring-blue-700" aria-label="Open Menu">
88
<svg class="w-7 h-7" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">

views/landing.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- Hero Section -->
22
<section class="bg-gradient-to-br from-blue-100 to-blue-300 py-16 text-center">
3-
<h1 class="text-4xl md:text-5xl font-bold mb-4 text-welcomeColor">Welcome to <span class="font-monserrat">{{title}}</span></h1>
3+
<h1 class="text-4xl md:text-5xl mb-4 text-welcomeColor">Welcome to <span class="font-nunito font-bold">{{title}}</span></h1>
44
<p class="text-lg md:text-xl mb-6 text-blue-700">Organize, search, and manage your favorite books with ease.</p>
55
<p class="mt-2 text-blue-700">
66
BookWise is <span class="font-semibold">open source</span>! View the code or contribute on

views/layouts/layout.hbs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
{{!-- <script src="https://cdn.tailwindcss.com/3.0.0"></script> --}}
1111
<link rel="stylesheet" href="/stylesheets/output.css"/>
1212
<link rel='stylesheet' href='/stylesheets/style.css' />
13-
<link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&family=Playfair+Display:wght@700&family=Poppins:wght@400;700&family=Merriweather:wght@400;700&family=Inter:wght@400;700&family=Roboto:wght@400;700&family=Nunito:wght@400;700&family=Raleway:wght@700&family=Lato:wght@700&family=Quicksand:wght@700&family=Source+Sans+3:wght@700&family=Barlow:wght@700&display=swap" rel="stylesheet">
13+
<link
14+
href="https://fonts.googleapis.com/css2?family=Baloo+2:wght@400;700&family=Barlow:wght@400;700&family=Inter:wght@400;700&family=Lato:wght@400;700&family=Marhey:wght@400;700&family=Merriweather:wght@400;700&family=Montserrat:wght@400;700&family=Nunito:wght@400;700&family=Playfair+Display:wght@400;700&family=Poppins:wght@400;700&family=Quicksand:wght@400;700&family=Raleway:wght@400;700&family=Roboto:wght@400;700&family=Source+Sans+3:wght@400;700&display=swap"
15+
rel="stylesheet">
1416

1517
</head>
1618
<body class="font-inter min-h-screen flex flex-col">

0 commit comments

Comments
 (0)