diff --git a/app/Resources/fonts/inter-600.woff2 b/app/Resources/fonts/inter-600.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..611e90c958f1b784ada6be1c603b923d57ca88b9
Binary files /dev/null and b/app/Resources/fonts/inter-600.woff2 differ
diff --git a/app/Resources/fonts/inter-regular.woff2 b/app/Resources/fonts/inter-regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..6c2b6893d593201d7c94e52687f78b2ef28b357e
Binary files /dev/null and b/app/Resources/fonts/inter-regular.woff2 differ
diff --git a/app/Resources/fonts/montserrat-600.woff2 b/app/Resources/fonts/montserrat-600.woff2
deleted file mode 100644
index 29cc1a9734501f08df2d097c77bead989321249c..0000000000000000000000000000000000000000
Binary files a/app/Resources/fonts/montserrat-600.woff2 and /dev/null differ
diff --git a/app/Resources/fonts/montserrat-regular.woff2 b/app/Resources/fonts/montserrat-regular.woff2
deleted file mode 100644
index 70788c2732074a4a752cb2e0410d49fb1b067cc0..0000000000000000000000000000000000000000
Binary files a/app/Resources/fonts/montserrat-regular.woff2 and /dev/null differ
diff --git a/app/Resources/styles/fonts.css b/app/Resources/styles/fonts.css
index 3e92e82390f34e11bab29932b189b28cf9d39882..ac7c9896f3993ee87b6d0d008b9a9efad9e6136f 100644
--- a/app/Resources/styles/fonts.css
+++ b/app/Resources/styles/fonts.css
@@ -4,6 +4,7 @@
font-family: "Kumbh Sans";
font-style: normal;
font-weight: 400;
+ font-display: swap;
src: url("/fonts/kumbh-sans-regular.woff2") format("woff2");
}
@@ -12,22 +13,25 @@
font-family: "Kumbh Sans";
font-style: normal;
font-weight: 700;
+ font-display: swap;
src: url("/fonts/kumbh-sans-700.woff2") format("woff2");
}
- /* montserrat-regular */
+ /* inter-regular */
@font-face {
- font-family: "Montserrat";
+ font-family: "Inter";
font-style: normal;
font-weight: 400;
- src: url("/fonts/montserrat-regular.woff2") format("woff2");
+ font-display: swap;
+ src: url("/fonts/inter-regular.woff2") format("woff2");
}
- /* montserrat-600 - latin */
+ /* inter-600 */
@font-face {
- font-family: "Montserrat";
+ font-family: "Inter";
font-style: normal;
font-weight: 600;
- src: url("/fonts/montserrat-600.woff2") format("woff2");
+ font-display: swap;
+ src: url("/fonts/inter-600.woff2") format("woff2");
}
}
diff --git a/app/Views/Components/Forms/Input.php b/app/Views/Components/Forms/Input.php
index 2379ab4249cba6e26116093ead05b19f3b1508ce..1729e6c3668498ca8210f78aca32672e0b69fdc6 100644
--- a/app/Views/Components/Forms/Input.php
+++ b/app/Views/Components/Forms/Input.php
@@ -10,7 +10,7 @@ class Input extends FormComponent
public function render(): string
{
- $class = 'px-3 py-2 rounded-lg border-3 focus:ring-2 focus:ring-pine-500 focus:ring-offset-2 focus:ring-offset-pine-100 ' . $this->class;
+ $class = 'px-3 py-2 bg-white rounded-lg border-3 focus:ring-2 focus:ring-pine-500 focus:ring-offset-2 focus:ring-offset-pine-100 ' . $this->class;
if (session()->has('errors')) {
$error = session('errors')[$this->name];
diff --git a/tailwind.config.js b/tailwind.config.js
index cb142c44e666d00df04a72e667db274e547849ab..cfe1014c18d5e001108809b20ca7e23b9c048295 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,4 +1,5 @@
/* eslint-disable */
+const defaultTheme = require("tailwindcss/defaultTheme");
module.exports = {
mode: "jit",
@@ -12,9 +13,9 @@ module.exports = {
theme: {
extend: {
fontFamily: {
- sans: ["Montserrat", "sans-serif"],
- display: ["Kumbh Sans", "sans-serif"],
- body: ["Montserrat", "sans-serif"],
+ sans: ["Inter", ...defaultTheme.fontFamily.sans],
+ display: ["Kumbh Sans", ...defaultTheme.fontFamily.sans],
+ // body: ["Inter", ...defaultTheme.fontFamily.sans],
},
colors: {
pine: {
diff --git a/themes/cp_admin/page/create.php b/themes/cp_admin/page/create.php
index ef349fffe68c6ff0f9607cfc8ecc7b1240b7f6ee..d816629bf90baf70893c7fed576001371e2ff9da 100644
--- a/themes/cp_admin/page/create.php
+++ b/themes/cp_admin/page/create.php
@@ -14,20 +14,21 @@
<?= form_open(route_to('page-create'), [
'class' => 'flex flex-col max-w-3xl',
]) ?>
-<form action="<?= route_to('page-create') ?>" method="POST" class="flex flex-col max-w-3xl">
+<form action="<?= route_to('page-create') ?>" method="POST" class="flex flex-col max-w-3xl gap-y-4">
<?= csrf_field() ?>
<Forms.Field
name="title"
label="<?= lang('Page.form.title') ?>"
required="true"
- data-slugify="title" />
+ data-slugify="title"
+ class="max-w-sm" />
<div>
<Forms.Label for="slug"><?= lang('Page.form.permalink') ?></Forms.Label>
<permalink-edit class="inline-flex items-center text-xs" edit-label="<?= lang('Common.edit') ?>" copy-label="<?= lang('Common.copy') ?>" copied-label="<?= lang('Common.copied') ?>">
<span slot="domain"><?= base_url('pages') . '/' ?></span>
- <Forms.Input name="slug" value="<?= $episode->slug ?>" required="true" data-slugify="slug" slot="slug-input" class="flex-1 text-xs" />
+ <Forms.Input name="slug" required="true" data-slugify="slug" slot="slug-input" class="flex-1 text-xs" />
</permalink-edit>
</div>
diff --git a/themes/cp_admin/person/create.php b/themes/cp_admin/person/create.php
index acc0b97e9ead0c331e99bdd214616821f3a761ae..b33da6e23048b4e0d5b959335e8657fa7b2eb66e 100644
--- a/themes/cp_admin/person/create.php
+++ b/themes/cp_admin/person/create.php
@@ -11,7 +11,7 @@
<?= $this->section('content') ?>
-<form action="<?= route_to('person-create') ?>" method="POST" class="flex flex-col" enctype="multipart/form-data">
+<form action="<?= route_to('person-create') ?>" method="POST" class="flex flex-col max-w-sm" enctype="multipart/form-data">
<?= csrf_field() ?>
<Forms.Field
diff --git a/themes/cp_install/cache_config.php b/themes/cp_install/cache_config.php
index 67b5ce120217d06dc526de184437f6a7a6e2ac85..c4563b79b25c6d751de1d6671523553e6d598ca4 100644
--- a/themes/cp_install/cache_config.php
+++ b/themes/cp_install/cache_config.php
@@ -7,7 +7,7 @@
]) ?>
<?= csrf_field() ?>
-<h1 class="mb-4 text-xl font-bold font-display"><span class="inline-flex items-center justify-center w-12 h-12 mr-2 text-sm font-semibold tracking-wider border-4 rounded-full text-pine-700 border-pine-700 font-body">3/4</span><?= lang(
+<h1 class="mb-4 text-xl font-bold font-display"><span class="inline-flex items-center justify-center w-12 h-12 mr-2 text-sm font-semibold tracking-wider border-4 rounded-full text-pine-700 border-pine-700">3/4</span><?= lang(
'Install.form.cache_config',
) ?></h1>
diff --git a/themes/cp_install/create_superadmin.php b/themes/cp_install/create_superadmin.php
index b87f7af9741bc77fd1f2b7195aa537f04f343ccc..6e2b82993320050c3982b8e8fbb967b58b7d8134 100644
--- a/themes/cp_install/create_superadmin.php
+++ b/themes/cp_install/create_superadmin.php
@@ -7,7 +7,7 @@
]) ?>
<?= csrf_field() ?>
-<h1 class="mb-4 text-xl font-bold font-display"><span class="inline-flex items-center justify-center w-12 h-12 mr-2 text-sm font-semibold tracking-wider border-4 rounded-full text-pine-700 border-pine-700 font-body">4/4</span><?= lang(
+<h1 class="mb-4 text-xl font-bold font-display"><span class="inline-flex items-center justify-center w-12 h-12 mr-2 text-sm font-semibold tracking-wider border-4 rounded-full text-pine-700 border-pine-700">4/4</span><?= lang(
'Install.form.create_superadmin',
) ?></h1>
diff --git a/themes/cp_install/database_config.php b/themes/cp_install/database_config.php
index 6bd27dae89539e2013cac61b3dc8cc5838196403..425e31002cd01218ac5667f86990e4852a3b87c9 100644
--- a/themes/cp_install/database_config.php
+++ b/themes/cp_install/database_config.php
@@ -8,7 +8,7 @@
]) ?>
<?= csrf_field() ?>
-<h1 class="mb-2 text-xl font-bold font-display"><span class="inline-flex items-center justify-center w-12 h-12 mr-2 text-sm font-semibold tracking-wider border-4 rounded-full text-pine-700 border-pine-700 font-body">2/4</span><?= lang(
+<h1 class="mb-2 text-xl font-bold font-display"><span class="inline-flex items-center justify-center w-12 h-12 mr-2 text-sm font-semibold tracking-wider border-4 rounded-full text-pine-700 border-pine-700">2/4</span><?= lang(
'Install.form.database_config',
) ?></h1>
diff --git a/themes/cp_install/instance_config.php b/themes/cp_install/instance_config.php
index 7ab75810213a7932c0f811c9375e955222aa8419..13af10f918be91252cd5f85872fca785678aa145 100644
--- a/themes/cp_install/instance_config.php
+++ b/themes/cp_install/instance_config.php
@@ -8,7 +8,7 @@ adz
'/instance-config' ?>" class="flex flex-col w-full max-w-sm" method="post" accept-charset="utf-8">
<?= csrf_field() ?>
-<h1 class="mb-4 text-xl font-bold font-display"><span class="inline-flex items-center justify-center w-12 h-12 mr-2 text-sm font-semibold tracking-wider border-4 rounded-full text-pine-700 border-pine-700 font-body">1/4</span><?= lang(
+<h1 class="mb-4 text-xl font-bold font-display"><span class="inline-flex items-center justify-center w-12 h-12 mr-2 text-sm font-semibold tracking-wider border-4 rounded-full text-pine-700 border-pine-700">1/4</span><?= lang(
'Install.form.instance_config',
) ?></h1>
<?= form_label(lang('Install.form.hostname'), 'hostname') ?>