diff --git a/composer.json b/composer.json index b49f9668a..3603b936e 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ "league/flysystem-aws-s3-v3": "^3.0", "league/flysystem-sftp-v3": "^3.0", "livewire/livewire": "3.4.9", + "log1x/laravel-webfonts": "^1.0", "lorisleiva/laravel-actions": "^2.7", "nubs/random-name-generator": "^2.2", "phpseclib/phpseclib": "~3.0", diff --git a/composer.lock b/composer.lock index 9d04e9ec7..23d7d2e13 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dbce9f366320f4d58392673fe25c69f6", + "content-hash": "168e351cec87acbea9c1c745b83eead2", "packages": [ { "name": "amphp/amp", @@ -4522,6 +4522,68 @@ ], "time": "2024-03-14T14:03:32+00:00" }, + { + "name": "log1x/laravel-webfonts", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/Log1x/laravel-webfonts.git", + "reference": "0d38122aa7f5501394006a6715f7d97dac223507" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Log1x/laravel-webfonts/zipball/0d38122aa7f5501394006a6715f7d97dac223507", + "reference": "0d38122aa7f5501394006a6715f7d97dac223507", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^7.8", + "laravel/prompts": "^0.1.15", + "php": ">=8.1" + }, + "require-dev": { + "illuminate/console": "^10.41", + "illuminate/http": "^10.41", + "illuminate/support": "^10.41", + "laravel/pint": "^1.13" + }, + "type": "package", + "extra": { + "laravel": { + "providers": [ + "Log1x\\LaravelWebfonts\\WebfontsServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Log1x\\LaravelWebfonts\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Brandon Nifong", + "email": "brandon@tendency.me", + "homepage": "https://github.com/log1x" + } + ], + "description": "Download, install, and preload over 1500 Google fonts locally in your Laravel project", + "support": { + "issues": "https://github.com/Log1x/laravel-webfonts/issues", + "source": "https://github.com/Log1x/laravel-webfonts/tree/v1.0.1" + }, + "funding": [ + { + "url": "https://github.com/Log1x", + "type": "github" + } + ], + "time": "2024-03-28T11:53:11+00:00" + }, { "name": "lorisleiva/laravel-actions", "version": "v2.8.0", diff --git a/public/fonts/Inter-Black.ttf b/public/fonts/Inter-Black.ttf deleted file mode 100644 index b27822bae..000000000 Binary files a/public/fonts/Inter-Black.ttf and /dev/null differ diff --git a/public/fonts/Inter-Bold.ttf b/public/fonts/Inter-Bold.ttf deleted file mode 100644 index fe23eeb9c..000000000 Binary files a/public/fonts/Inter-Bold.ttf and /dev/null differ diff --git a/public/fonts/Inter-ExtraBold.ttf b/public/fonts/Inter-ExtraBold.ttf deleted file mode 100644 index 874b1b0dd..000000000 Binary files a/public/fonts/Inter-ExtraBold.ttf and /dev/null differ diff --git a/public/fonts/Inter-ExtraLight.ttf b/public/fonts/Inter-ExtraLight.ttf deleted file mode 100644 index c993e8221..000000000 Binary files a/public/fonts/Inter-ExtraLight.ttf and /dev/null differ diff --git a/public/fonts/Inter-Light.ttf b/public/fonts/Inter-Light.ttf deleted file mode 100644 index 71188f5cb..000000000 Binary files a/public/fonts/Inter-Light.ttf and /dev/null differ diff --git a/public/fonts/Inter-Medium.ttf b/public/fonts/Inter-Medium.ttf deleted file mode 100644 index a01f3777a..000000000 Binary files a/public/fonts/Inter-Medium.ttf and /dev/null differ diff --git a/public/fonts/Inter-Regular.ttf b/public/fonts/Inter-Regular.ttf deleted file mode 100644 index 5e4851f0a..000000000 Binary files a/public/fonts/Inter-Regular.ttf and /dev/null differ diff --git a/public/fonts/Inter-SemiBold.ttf b/public/fonts/Inter-SemiBold.ttf deleted file mode 100644 index ecc7041e2..000000000 Binary files a/public/fonts/Inter-SemiBold.ttf and /dev/null differ diff --git a/public/fonts/Inter-Thin.ttf b/public/fonts/Inter-Thin.ttf deleted file mode 100644 index fe77243fc..000000000 Binary files a/public/fonts/Inter-Thin.ttf and /dev/null differ diff --git a/resources/css/app.css b/resources/css/app.css index c7a029484..00a62a131 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,46 +1,9 @@ +@import 'fonts'; + @tailwind base; @tailwind components; @tailwind utilities; -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url('/fonts/Inter-Regular.ttf') format('ttf'); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 500; - font-display: swap; - src: url('/fonts/Inter-Medium.ttf') format('ttf'); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 600; - font-display: swap; - src: url('/fonts/Inter-SemiBold.ttf') format('ttf'); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url('/fonts/Inter-Bold.ttf') format('ttf'); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 800; - font-display: swap; - src: url('/fonts/Inter-ExtraBold.ttf') format('ttf'); -} html, diff --git a/resources/css/fonts.css b/resources/css/fonts.css new file mode 100644 index 000000000..c8c4448eb --- /dev/null +++ b/resources/css/fonts.css @@ -0,0 +1,72 @@ +@font-face { + font-display: swap; + font-family: 'Inter'; + font-style: normal; + font-weight: 100; + src: url('../fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-100.woff2') format('woff2'); +} + +@font-face { + font-display: swap; + font-family: 'Inter'; + font-style: normal; + font-weight: 200; + src: url('../fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200.woff2') format('woff2'); +} + +@font-face { + font-display: swap; + font-family: 'Inter'; + font-style: normal; + font-weight: 300; + src: url('../fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300.woff2') format('woff2'); +} + +@font-face { + font-display: swap; + font-family: 'Inter'; + font-style: normal; + font-weight: 500; + src: url('../fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500.woff2') format('woff2'); +} + +@font-face { + font-display: swap; + font-family: 'Inter'; + font-style: normal; + font-weight: 600; + src: url('../fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600.woff2') format('woff2'); +} + +@font-face { + font-display: swap; + font-family: 'Inter'; + font-style: normal; + font-weight: 700; + src: url('../fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700.woff2') format('woff2'); +} + +@font-face { + font-display: swap; + font-family: 'Inter'; + font-style: normal; + font-weight: 800; + src: url('../fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800.woff2') format('woff2'); +} + +@font-face { + font-display: swap; + font-family: 'Inter'; + font-style: normal; + font-weight: 900; + src: url('../fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900.woff2') format('woff2'); +} + +@font-face { + font-display: swap; + font-family: 'Inter'; + font-style: normal; + font-weight: 400; + src: url('../fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff2') format('woff2'); +} + diff --git a/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-100.woff2 b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-100.woff2 new file mode 100644 index 000000000..b613fbe10 Binary files /dev/null and b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-100.woff2 differ diff --git a/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200.woff2 b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200.woff2 new file mode 100644 index 000000000..f794d5269 Binary files /dev/null and b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200.woff2 differ diff --git a/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300.woff2 b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300.woff2 new file mode 100644 index 000000000..d691930af Binary files /dev/null and b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300.woff2 differ diff --git a/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500.woff2 b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500.woff2 new file mode 100644 index 000000000..59b258cd9 Binary files /dev/null and b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500.woff2 differ diff --git a/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600.woff2 b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600.woff2 new file mode 100644 index 000000000..7c48dc820 Binary files /dev/null and b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600.woff2 differ diff --git a/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700.woff2 b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700.woff2 new file mode 100644 index 000000000..f95b3a661 Binary files /dev/null and b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700.woff2 differ diff --git a/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800.woff2 b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800.woff2 new file mode 100644 index 000000000..0550f82b4 Binary files /dev/null and b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800.woff2 differ diff --git a/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900.woff2 b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900.woff2 new file mode 100644 index 000000000..121ed4936 Binary files /dev/null and b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900.woff2 differ diff --git a/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff2 b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff2 new file mode 100644 index 000000000..33d9e53c5 Binary files /dev/null and b/resources/fonts/inter-v13-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff2 differ