Merge pull request #1300 from jonnybarnes/develop

MTM Switch fonts
2024-02-23 16:41:54 +00:00 · 2024-02-23 16:41:54 +00:00 · b40f10cada
commit b40f10cada
parent deba175f8f 396b0dccf1
6 changed files with 52 additions and 74 deletions
--- a/.env.example
+++ b/.env.example
@ -86,6 +86,4 @@ LOG_SLACK_WEBHOOK_URL=
 FLARE_KEY=
 IGNITION_OPEN_AI_KEY=

-FONT_LINK=
-
 BRIDGY_MASTODON_TOKEN=
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@ -9,12 +9,6 @@ jobs:

    name: PHPUnit test suite

-    strategy:
-      matrix:
-        operating-system: ['ubuntu-latest']
-        php-versions: ['8.2', '8.3']
-        phpunit-versions: ['latest']
-
    services:
      postgres:
        image: postgres:latest
@ -32,10 +26,10 @@ jobs:
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: '8.3'
          extensions: mbstring, intl, phpredis, imagick
          coverage: xdebug
-          tools: phpunit:${{ matrix.phpunit-versions }}
+          tools: phpunit
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@ -51,9 +45,9 @@ jobs:
        uses: actions/cache@v3
        with:
          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-php-8.3-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: |
-            ${{ runner.os }}-php-${{ matrix.php-version }}-composer-
+            ${{ runner.os }}-php-8.3-composer-

      - name: Install Composer Dependencies
        run: composer install --quiet --no-ansi --no-interaction --no-progress
--- a/composer.lock
+++ b/composer.lock
@ -653,16 +653,16 @@
        },
        {
            "name": "doctrine/inflector",
-            "version": "2.0.9",
+            "version": "2.0.10",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65"
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65",
-                "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
                "shasum": ""
            },
            "require": {
@ -724,7 +724,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.9"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
            },
            "funding": [
                {
@ -740,7 +740,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-15T18:05:13+00:00"
+            "time": "2024-02-18T20:23:39+00:00"
        },
        {
            "name": "doctrine/lexer",
@ -1944,16 +1944,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v10.44.0",
+            "version": "v10.45.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "1199dbe361787bbe9648131a79f53921b4148cf6"
+                "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/1199dbe361787bbe9648131a79f53921b4148cf6",
-                "reference": "1199dbe361787bbe9648131a79f53921b4148cf6",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/dcf5d1d722b84ad38a5e053289130b6962f830bd",
+                "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd",
                "shasum": ""
            },
            "require": {
@ -2146,20 +2146,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-02-13T16:01:16+00:00"
+            "time": "2024-02-21T14:07:36+00:00"
        },
        {
            "name": "laravel/horizon",
-            "version": "v5.23.0",
+            "version": "v5.23.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/horizon.git",
-                "reference": "0b1bf46b21c397fdbe80b1ab54451fd227934508"
+                "reference": "7475de7eb5b465c2da84218002fe1a62b8175da0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/horizon/zipball/0b1bf46b21c397fdbe80b1ab54451fd227934508",
-                "reference": "0b1bf46b21c397fdbe80b1ab54451fd227934508",
+                "url": "https://api.github.com/repos/laravel/horizon/zipball/7475de7eb5b465c2da84218002fe1a62b8175da0",
+                "reference": "7475de7eb5b465c2da84218002fe1a62b8175da0",
                "shasum": ""
            },
            "require": {
@ -2222,9 +2222,9 @@
            ],
            "support": {
                "issues": "https://github.com/laravel/horizon/issues",
-                "source": "https://github.com/laravel/horizon/tree/v5.23.0"
+                "source": "https://github.com/laravel/horizon/tree/v5.23.1"
            },
-            "time": "2024-02-12T18:36:34+00:00"
+            "time": "2024-02-20T15:14:10+00:00"
        },
        {
            "name": "laravel/prompts",
@ -9848,16 +9848,16 @@
        },
        {
            "name": "laravel/dusk",
-            "version": "v7.12.1",
+            "version": "v7.12.3",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/dusk.git",
-                "reference": "e7c2509034753dd4b2339b082884eef357673bf7"
+                "reference": "676df11326c29d11ee566cd046f8e49e0ce6eb0a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/dusk/zipball/e7c2509034753dd4b2339b082884eef357673bf7",
-                "reference": "e7c2509034753dd4b2339b082884eef357673bf7",
+                "url": "https://api.github.com/repos/laravel/dusk/zipball/676df11326c29d11ee566cd046f8e49e0ce6eb0a",
+                "reference": "676df11326c29d11ee566cd046f8e49e0ce6eb0a",
                "shasum": ""
            },
            "require": {
@ -9918,22 +9918,22 @@
            ],
            "support": {
                "issues": "https://github.com/laravel/dusk/issues",
-                "source": "https://github.com/laravel/dusk/tree/v7.12.1"
+                "source": "https://github.com/laravel/dusk/tree/v7.12.3"
            },
-            "time": "2024-01-03T22:54:48+00:00"
+            "time": "2024-02-15T13:38:58+00:00"
        },
        {
            "name": "laravel/pint",
-            "version": "v1.13.11",
+            "version": "v1.14.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/pint.git",
-                "reference": "60a163c3e7e3346a1dec96d3e6f02e6465452552"
+                "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/60a163c3e7e3346a1dec96d3e6f02e6465452552",
-                "reference": "60a163c3e7e3346a1dec96d3e6f02e6465452552",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/6b127276e3f263f7bb17d5077e9e0269e61b2a0e",
+                "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e",
                "shasum": ""
            },
            "require": {
@ -9986,20 +9986,20 @@
                "issues": "https://github.com/laravel/pint/issues",
                "source": "https://github.com/laravel/pint"
            },
-            "time": "2024-02-13T17:20:13+00:00"
+            "time": "2024-02-20T17:38:05+00:00"
        },
        {
            "name": "laravel/sail",
-            "version": "v1.27.4",
+            "version": "v1.28.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sail.git",
-                "reference": "3047e1a157fad968cc5f6e620d5cbe5c0867fffd"
+                "reference": "a05861ca9b04558b1ec1f36cff521a271a259b6c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/3047e1a157fad968cc5f6e620d5cbe5c0867fffd",
-                "reference": "3047e1a157fad968cc5f6e620d5cbe5c0867fffd",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/a05861ca9b04558b1ec1f36cff521a271a259b6c",
+                "reference": "a05861ca9b04558b1ec1f36cff521a271a259b6c",
                "shasum": ""
            },
            "require": {
@ -10048,7 +10048,7 @@
                "issues": "https://github.com/laravel/sail/issues",
                "source": "https://github.com/laravel/sail"
            },
-            "time": "2024-02-08T15:24:21+00:00"
+            "time": "2024-02-20T15:11:00+00:00"
        },
        {
            "name": "maximebf/debugbar",
@ -11277,21 +11277,21 @@
        },
        {
            "name": "phpdocumentor/type-resolver",
-            "version": "1.8.0",
+            "version": "1.8.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc"
+                "reference": "153ae662783729388a584b4361f2545e4d841e3c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc",
-                "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
+                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
                "shasum": ""
            },
            "require": {
                "doctrine/deprecations": "^1.0",
-                "php": "^7.4 || ^8.0",
+                "php": "^7.3 || ^8.0",
                "phpdocumentor/reflection-common": "^2.0",
                "phpstan/phpdoc-parser": "^1.13"
            },
@ -11329,9 +11329,9 @@
            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
            "support": {
                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2"
            },
-            "time": "2024-01-11T11:49:22+00:00"
+            "time": "2024-02-23T11:10:43+00:00"
        },
        {
            "name": "phpstan/phpdoc-parser",
@ -13619,16 +13619,16 @@
        },
        {
            "name": "vimeo/psalm",
-            "version": "5.22.1",
+            "version": "5.22.2",
            "source": {
                "type": "git",
                "url": "https://github.com/vimeo/psalm.git",
-                "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43"
+                "reference": "d768d914152dbbf3486c36398802f74e80cfde48"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/e9dad66e11274315dac27e08349c628c7d6a1a43",
-                "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/d768d914152dbbf3486c36398802f74e80cfde48",
+                "reference": "d768d914152dbbf3486c36398802f74e80cfde48",
                "shasum": ""
            },
            "require": {
@ -13725,7 +13725,7 @@
                "issues": "https://github.com/vimeo/psalm/issues",
                "source": "https://github.com/vimeo/psalm"
            },
-            "time": "2024-02-15T22:52:31+00:00"
+            "time": "2024-02-22T23:39:07+00:00"
        },
        {
            "name": "zbateson/mail-mime-parser",
--- a/config/app.php
+++ b/config/app.php
@ -144,17 +144,6 @@ return [
        // 'store'  => 'redis',
    ],

-    /*
-    |--------------------------------------------------------------------------
-    | Font Link
-    |--------------------------------------------------------------------------
-    |
-    | Which URL should the app load custom fonts from
-    |
-    */
-
-    'font_link' => env('FONT_LINK'),
-
    /*
    |--------------------------------------------------------------------------
    | Autoloaded Service Providers
--- a/public/assets/css/variables.css
+++ b/public/assets/css/variables.css
@ -1,8 +1,8 @@
 :root {
  /* Font Family */
-  --font-family-headings: "Archer SSm A", "Archer SSm B", serif;
-  --font-family-body: "Verlag A", "Verlag B", sans-serif;
-  --font-family-monospace: "Operator Mono SSm A", "Operator Mono SSm B", monospace;
+  --font-family-headings: Rockwell, 'Rockwell Nova', 'Roboto Slab', 'DejaVu Serif', 'Sitka Small', serif;
+  --font-family-body: Charter, 'Bitstream Charter', 'Sitka Text', Cambria, serif;
+  --font-family-monospace: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace;;

  /* Font Size */
  --font-size-sm: 0.75rem;   /* 12px */
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@ -4,9 +4,6 @@
        <meta charset="UTF-8">
        <meta name="csrf-token" content="{{ csrf_token() }}">
        <title>@yield('title'){{ config('app.name') }}</title>
-        @if (!empty(config('app.font_link')))
-            <link rel="stylesheet" href="{{ config('app.font_link') }}">
-        @endif
        <link rel="stylesheet" href="/assets/highlight/zenburn.css">
        <link rel="stylesheet" href="/assets/css/app.css">
        <link rel="alternate" type="application/rss+xml" title="Blog RSS Feed" href="/blog/feed.rss">