diff --git a/app/assets/stylesheets/lato-fonts.css b/app/assets/stylesheets/lato-fonts.css index 0e5716701..e6b0c27ce 100644 --- a/app/assets/stylesheets/lato-fonts.css +++ b/app/assets/stylesheets/lato-fonts.css @@ -2,54 +2,34 @@ font-family: 'Lato'; font-style: normal; font-weight: 300; - src: local('Lato Light'), local('Lato-Light'); - src: url('/fonts/lato/Lato-Light.eot'); /* IE9 Compat Modes */ - src: url('/fonts/lato/Lato-Light.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/fonts/lato/Lato-Light.woff2') format('woff2'), /* Modern Browsers */ - url('/fonts/lato/Lato-Light.woff') format('woff'), /* Modern Browsers */ - url('/fonts/lato/Lato-Light.ttf') format('truetype'); + src: url('lato-latin-300-normal.woff2') format('woff2'), + url('lato-latin-300-normal.woff') format('woff'); } @font-face { font-family: 'Lato'; font-style: normal; font-weight: 400; - src: local('Lato Regular'), local('Lato-Regular'); - src: url('/fonts/lato/Lato-Regular.eot'); /* IE9 Compat Modes */ - src: url('/fonts/lato/Lato-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/fonts/lato/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */ - url('/fonts/lato/Lato-Regular.woff') format('woff'), /* Modern Browsers */ - url('/fonts/lato/Lato-Regular.ttf') format('truetype'); + src: url('lato-latin-400-normal.woff2') format('woff2'), + url('lato-latin-400-normal.woff') format('woff'); } @font-face { font-family: 'Lato'; font-style: normal; font-weight: 700; - src: local('Lato Bold'), local('Lato-Bold'); - src: url('/fonts/lato/Lato-Bold.eot'); /* IE9 Compat Modes */ - src: url('/fonts/lato/Lato-Bold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/fonts/lato/Lato-Bold.woff2') format('woff2'), /* Modern Browsers */ - url('/fonts/lato/Lato-Bold.woff') format('woff'), /* Modern Browsers */ - url('/fonts/lato/Lato-Bold.ttf') format('truetype'); + src: url('lato-latin-700-normal.woff2') format('woff2'), + url('lato-latin-700-normal.woff') format('woff'); } @font-face { font-family: 'Lato'; font-style: normal; font-weight: 900; - src: local('Lato Black'), local('Lato-Black'); - src: url('/fonts/lato/Lato-Black.eot'); /* IE9 Compat Modes */ - src: url('/fonts/lato/Lato-Black.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/fonts/lato/Lato-Black.woff2') format('woff2'), /* Modern Browsers */ - url('/fonts/lato/Lato-Black.woff') format('woff'), /* Modern Browsers */ - url('/fonts/lato/Lato-Black.ttf') format('truetype'); + src: url('lato-latin-900-normal.woff2') format('woff2'), + url('lato-latin-900-normal.woff') format('woff'); } @font-face { font-family: 'Lato'; font-style: italic; font-weight: 400; - src: local('Lato Italic'), local('Lato-Italic'); - src: url('/fonts/lato/Lato-Italic.eot'); /* IE9 Compat Modes */ - src: url('/fonts/lato/Lato-Italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/fonts/lato/Lato-Italic.woff2') format('woff2'), /* Modern Browsers */ - url('/fonts/lato/Lato-Italic.woff') format('woff'), /* Modern Browsers */ - url('/fonts/lato/Lato-Italic.ttf') format('truetype'); + src: url('lato-latin-400-italic.woff2') format('woff2'), + url('lato-latin-400-italic.woff') format('woff'); } diff --git a/app/assets/stylesheets/reenie-beanie-font.css b/app/assets/stylesheets/reenie-beanie-font.css index 6eff32abd..bd2ed6bac 100644 --- a/app/assets/stylesheets/reenie-beanie-font.css +++ b/app/assets/stylesheets/reenie-beanie-font.css @@ -2,10 +2,6 @@ font-family: 'Reenie Beanie'; font-style: normal; font-weight: 400; - src: local('Reenie Beanie'), local('ReenieBeanie'); - src: url('/fonts/reenie-beanie/ReenieBeanie.eot?#iefix') format('embedded-opentype'), - url('/fonts/reenie-beanie/ReenieBeanie.woff2') format('woff2'), - url('/fonts/reenie-beanie/ReenieBeanie.woff') format('woff'), - url('/fonts/reenie-beanie/ReenieBeanie.ttf') format('truetype'), - url('/fonts/reenie-beanie/ReenieBeanie.svg#ReenieBeanie') format('svg'); + src: url('reenie-beanie-latin-400-normal.woff2') format('woff2'), + url('reenie-beanie-latin-400-normal.woff') format('woff'); } diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index c7e2e958a..cf7be3b92 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -13,5 +13,7 @@ Rails.root.join("node_modules/jquery"), Rails.root.join("node_modules/mousetrap"), Rails.root.join("node_modules/underscore"), - Rails.root.join("node_modules/jquery-visible") + Rails.root.join("node_modules/jquery-visible"), + Rails.root.join("node_modules/@fontsource/lato/files"), + Rails.root.join("node_modules/@fontsource/reenie-beanie/files") ] diff --git a/package.json b/package.json index d3257eb31..54bcd9913 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,8 @@ "stylelint": "stylelint 'app/assets/stylesheets/**/*.css'" }, "dependencies": { + "@fontsource/lato": "^5.2.7", + "@fontsource/reenie-beanie": "^5.2.8", "backbone": "1.0.0", "bootstrap": "3.1.1", "jquery": "1.9.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 82c8030a0..eed0f160f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,12 @@ importers: .: dependencies: + '@fontsource/lato': + specifier: ^5.2.7 + version: 5.2.7 + '@fontsource/reenie-beanie': + specifier: ^5.2.8 + version: 5.2.8 backbone: specifier: 1.0.0 version: 1.0.0 @@ -160,6 +166,12 @@ packages: resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@fontsource/lato@5.2.7': + resolution: {integrity: sha512-k5mum1ADbDW5cTw1Ett1eQVWeoZ6gq0ct6SFBibEhB4LRxhniChJZTBgd6ph5yBxLkN1fcnsnmicBNA4S/3nbw==} + + '@fontsource/reenie-beanie@5.2.8': + resolution: {integrity: sha512-fDPSpU64a8rVtu5NKRogzKx/fukotfpcet8gFDzHYctRX3xIZ8MCbCGGS4XxJuwhSuhRJX59Ur0eU0QpBQpTZg==} + '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} @@ -1101,6 +1113,10 @@ snapshots: '@eslint/core': 0.17.0 levn: 0.4.1 + '@fontsource/lato@5.2.7': {} + + '@fontsource/reenie-beanie@5.2.8': {} + '@humanfs/core@0.19.1': {} '@humanfs/node@0.16.7': diff --git a/public/fonts/lato/Lato-Black.eot b/public/fonts/lato/Lato-Black.eot deleted file mode 100644 index 444bc3aa2..000000000 Binary files a/public/fonts/lato/Lato-Black.eot and /dev/null differ diff --git a/public/fonts/lato/Lato-Black.ttf b/public/fonts/lato/Lato-Black.ttf deleted file mode 100644 index 3f7819f60..000000000 Binary files a/public/fonts/lato/Lato-Black.ttf and /dev/null differ diff --git a/public/fonts/lato/Lato-Black.woff b/public/fonts/lato/Lato-Black.woff deleted file mode 100644 index a0ab25e9a..000000000 Binary files a/public/fonts/lato/Lato-Black.woff and /dev/null differ diff --git a/public/fonts/lato/Lato-Black.woff2 b/public/fonts/lato/Lato-Black.woff2 deleted file mode 100644 index 3ee7cd441..000000000 Binary files a/public/fonts/lato/Lato-Black.woff2 and /dev/null differ diff --git a/public/fonts/lato/Lato-Bold.eot b/public/fonts/lato/Lato-Bold.eot deleted file mode 100644 index 3361183a4..000000000 Binary files a/public/fonts/lato/Lato-Bold.eot and /dev/null differ diff --git a/public/fonts/lato/Lato-Bold.ttf b/public/fonts/lato/Lato-Bold.ttf deleted file mode 100644 index 29f691d5e..000000000 Binary files a/public/fonts/lato/Lato-Bold.ttf and /dev/null differ diff --git a/public/fonts/lato/Lato-Bold.woff b/public/fonts/lato/Lato-Bold.woff deleted file mode 100644 index c6dff51f0..000000000 Binary files a/public/fonts/lato/Lato-Bold.woff and /dev/null differ diff --git a/public/fonts/lato/Lato-Bold.woff2 b/public/fonts/lato/Lato-Bold.woff2 deleted file mode 100644 index bb195043c..000000000 Binary files a/public/fonts/lato/Lato-Bold.woff2 and /dev/null differ diff --git a/public/fonts/lato/Lato-Italic.eot b/public/fonts/lato/Lato-Italic.eot deleted file mode 100644 index 3f826421a..000000000 Binary files a/public/fonts/lato/Lato-Italic.eot and /dev/null differ diff --git a/public/fonts/lato/Lato-Italic.ttf b/public/fonts/lato/Lato-Italic.ttf deleted file mode 100644 index b4bfc9b24..000000000 Binary files a/public/fonts/lato/Lato-Italic.ttf and /dev/null differ diff --git a/public/fonts/lato/Lato-Italic.woff b/public/fonts/lato/Lato-Italic.woff deleted file mode 100644 index 76114bc03..000000000 Binary files a/public/fonts/lato/Lato-Italic.woff and /dev/null differ diff --git a/public/fonts/lato/Lato-Italic.woff2 b/public/fonts/lato/Lato-Italic.woff2 deleted file mode 100644 index 3404f37e2..000000000 Binary files a/public/fonts/lato/Lato-Italic.woff2 and /dev/null differ diff --git a/public/fonts/lato/Lato-Light.eot b/public/fonts/lato/Lato-Light.eot deleted file mode 100644 index f449ed562..000000000 Binary files a/public/fonts/lato/Lato-Light.eot and /dev/null differ diff --git a/public/fonts/lato/Lato-Light.ttf b/public/fonts/lato/Lato-Light.ttf deleted file mode 100644 index 834d1c056..000000000 Binary files a/public/fonts/lato/Lato-Light.ttf and /dev/null differ diff --git a/public/fonts/lato/Lato-Light.woff b/public/fonts/lato/Lato-Light.woff deleted file mode 100644 index 77b4e148f..000000000 Binary files a/public/fonts/lato/Lato-Light.woff and /dev/null differ diff --git a/public/fonts/lato/Lato-Light.woff2 b/public/fonts/lato/Lato-Light.woff2 deleted file mode 100644 index ce49f8221..000000000 Binary files a/public/fonts/lato/Lato-Light.woff2 and /dev/null differ diff --git a/public/fonts/lato/Lato-Regular.eot b/public/fonts/lato/Lato-Regular.eot deleted file mode 100644 index 11e3f2a5f..000000000 Binary files a/public/fonts/lato/Lato-Regular.eot and /dev/null differ diff --git a/public/fonts/lato/Lato-Regular.ttf b/public/fonts/lato/Lato-Regular.ttf deleted file mode 100644 index 74decd9eb..000000000 Binary files a/public/fonts/lato/Lato-Regular.ttf and /dev/null differ diff --git a/public/fonts/lato/Lato-Regular.woff b/public/fonts/lato/Lato-Regular.woff deleted file mode 100644 index ae1307ff5..000000000 Binary files a/public/fonts/lato/Lato-Regular.woff and /dev/null differ diff --git a/public/fonts/lato/Lato-Regular.woff2 b/public/fonts/lato/Lato-Regular.woff2 deleted file mode 100644 index 3bf984332..000000000 Binary files a/public/fonts/lato/Lato-Regular.woff2 and /dev/null differ diff --git a/public/fonts/reenie-beanie/ReenieBeanie.eot b/public/fonts/reenie-beanie/ReenieBeanie.eot deleted file mode 100644 index 79d0e10e9..000000000 Binary files a/public/fonts/reenie-beanie/ReenieBeanie.eot and /dev/null differ diff --git a/public/fonts/reenie-beanie/ReenieBeanie.svg b/public/fonts/reenie-beanie/ReenieBeanie.svg deleted file mode 100644 index 63360da56..000000000 --- a/public/fonts/reenie-beanie/ReenieBeanie.svg +++ /dev/null @@ -1,665 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/reenie-beanie/ReenieBeanie.ttf b/public/fonts/reenie-beanie/ReenieBeanie.ttf deleted file mode 100644 index 7b195bf7e..000000000 Binary files a/public/fonts/reenie-beanie/ReenieBeanie.ttf and /dev/null differ diff --git a/public/fonts/reenie-beanie/ReenieBeanie.woff b/public/fonts/reenie-beanie/ReenieBeanie.woff deleted file mode 100644 index 9ba04981e..000000000 Binary files a/public/fonts/reenie-beanie/ReenieBeanie.woff and /dev/null differ diff --git a/public/fonts/reenie-beanie/ReenieBeanie.woff2 b/public/fonts/reenie-beanie/ReenieBeanie.woff2 deleted file mode 100644 index 1b7d026f9..000000000 Binary files a/public/fonts/reenie-beanie/ReenieBeanie.woff2 and /dev/null differ