Skip to content

refactor: Centralize font imports and define custom font families in Tailwind #303

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.

Sign up for GitHub

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

Open
dzienisz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: Centralize font imports and define custom font families in Tailwind #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions app.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<section
id="main"
class="text-gray-400 body-font px-3 sm:px-5"
class="text-gray-400 font-body px-3 sm:px-5"
>
<transition
name="flash"
Expand All @@ -43,7 +43,7 @@
>
<Device />
</div>
<h2 class="text-lg sm:text-xl font-medium title-font text-white mt-5">
<h2 class="text-lg sm:text-xl font-medium font-title text-white mt-5">
{{ $t('device.title') }}
</h2>
<p class="text-sm sm:text-base leading-relaxed mt-2">
Expand All @@ -58,7 +58,7 @@
/>
<Firmware />
</div>
<h2 class="text-lg sm:text-xl font-medium title-font text-white mt-5">
<h2 class="text-lg sm:text-xl font-medium font-title text-white mt-5">
{{ $t('firmware.title') }}
</h2>
<p class="text-sm sm:text-base leading-relaxed mt-2">
Expand All @@ -70,7 +70,7 @@
<Zap class="h-60 w-60 p-5 mt-10 mb-10 mx-auto text-white" />
<Flash />
</div>
<h2 class="text-lg sm:text-xl font-medium title-font text-white mt-5">
<h2 class="text-lg sm:text-xl font-medium font-title text-white mt-5">
Flash
</h2>
<p class="text-sm sm:text-base leading-relaxed mt-2">
Expand Down Expand Up @@ -245,31 +245,14 @@ onMounted(() => {
</script>

<style>
@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Atkinson+Hyperlegible:ital,wght@0,400;0,700;1,400;1,700&display=swap');
/* Additional Atkinson Hyperlegible fallback */
@font-face {
font-family: 'Atkinson Hyperlegible';
src: url('https://fonts.gstatic.com/s/atkinsonhyperlegible/v11/9Bt23C1KxNDXMspQ1lPyU89-1h6ONRlW45GE.woff2') format('woff2');
font-weight: 400;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'Atkinson Hyperlegible';
src: url('https://fonts.gstatic.com/s/atkinsonhyperlegible/v11/9Bt43C1KxNDXMspQ1lPyU89-1h6ONRlW45G055LkgA.woff2') format('woff2');
font-weight: 700;
font-style: normal;
font-display: swap;
}
:root {
--bg-color: #1e1f2a;
--text-color: #FFFFFF;
--primary-color: #67EA94;
--secondary-color: #67EA94;
}
body {
font-family: 'Atkinson Hyperlegible', 'Lato', 'Inter', sans-serif;
@apply font-body;
background-color: var(--bg-color);
color: var(--text-color);
}
Expand Down
3 changes: 3 additions & 0 deletions assets/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import url('https://fonts.googleapis.com/css2?family=Atkinson+Hyperlegible:ital,wght@0,400;0,700;1,400;1,700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap');

@tailwind base;
@tailwind components;
@tailwind utilities;
Expand Down
2 changes: 1 addition & 1 deletion components/DeviceDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="flex flex-col items-center p-2 w-full sm:w-56">
<h5
class="mb-1 text-xs sm:text-[0.75rem] text-white"
class="mb-1 text-md sm:text-[0.75rem] text-white"
:class="{ 'text-yellow-400': !isSupporterDevice(props.device) }"
>
{{ props.device.displayName }}
Expand Down
5 changes: 1 addition & 4 deletions components/ToastNotifications.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,7 @@ function reloadPage() {
transition: transform 0.4s cubic-bezier(0.4, 0, 0.2, 1);
}

/* Ensure proper font family */
.max-w-sm {
font-family: 'Atkinson Hyperlegible', 'Lato', 'Inter', sans-serif;
}


/* Custom focus ring for meshtastic theme */
.focus\:ring-meshtastic:focus {
Expand Down
8 changes: 7 additions & 1 deletion tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ export default {
'./node_modules/flowbite-vue/**/*.{js,jsx,ts,tsx,vue}',
],
theme: {
extend: {},
extend: {
fontFamily: {
sans: ['Inter', 'sans-serif'],
title: ['Inter', 'sans-serif'],
body: ['"Atkinson Hyperlegible"', 'sans-serif'],
},
},
},
plugins: [
require('flowbite/plugin'),
Expand Down