diff --git a/app/Resources/fonts/inter-600.woff2 b/app/Resources/fonts/inter-600.woff2 new file mode 100644 index 00000000..611e90c9 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 00000000..6c2b6893 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 29cc1a97..00000000 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 70788c27..00000000 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 3e92e823..ac7c9896 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 2379ab42..1729e6c3 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 cb142c44..cfe1014c 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 ef349fff..d816629b 100644 --- a/themes/cp_admin/page/create.php +++ b/themes/cp_admin/page/create.php @@ -14,20 +14,21 @@ 'flex flex-col max-w-3xl', ]) ?> -
+ + data-slugify="title" + class="max-w-sm" />
- +
diff --git a/themes/cp_admin/person/create.php b/themes/cp_admin/person/create.php index acc0b97e..b33da6e2 100644 --- a/themes/cp_admin/person/create.php +++ b/themes/cp_admin/person/create.php @@ -11,7 +11,7 @@ section('content') ?> - + -

3/43/4

diff --git a/themes/cp_install/create_superadmin.php b/themes/cp_install/create_superadmin.php index b87f7af9..6e2b8299 100644 --- a/themes/cp_install/create_superadmin.php +++ b/themes/cp_install/create_superadmin.php @@ -7,7 +7,7 @@ ]) ?> -

4/44/4

diff --git a/themes/cp_install/database_config.php b/themes/cp_install/database_config.php index 6bd27dae..425e3100 100644 --- a/themes/cp_install/database_config.php +++ b/themes/cp_install/database_config.php @@ -8,7 +8,7 @@ ]) ?> -

2/42/4

diff --git a/themes/cp_install/instance_config.php b/themes/cp_install/instance_config.php index 7ab75810..13af10f9 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"> -

1/41/4