jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Merge pull request #1300 from jonnybarnes/develop

Browse source 
MTM Switch fonts
This commit is contained in:
Jonny Barnes 2024-02-23 16:41:54 +00:00 • committed by GitHub
commit b40f10cada
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 52 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env.example
View file

@ -86,6 +86,4 @@ LOG_SLACK_WEBHOOK_URL=
FLARE_KEY= FLARE_KEY=
IGNITION_OPEN_AI_KEY= IGNITION_OPEN_AI_KEY=
FONT_LINK=
BRIDGY_MASTODON_TOKEN= BRIDGY_MASTODON_TOKEN=

14
.github/workflows/phpunit.yml vendored
View file

@ -9,12 +9,6 @@ jobs:
name: PHPUnit test suite name: PHPUnit test suite
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-versions: ['8.2', '8.3']
phpunit-versions: ['latest']
services: services:
postgres: postgres:
image: postgres:latest image: postgres:latest
@ -32,10 +26,10 @@ jobs:
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: ${{ matrix.php-versions }} php-version: '8.3'
extensions: mbstring, intl, phpredis, imagick extensions: mbstring, intl, phpredis, imagick
coverage: xdebug coverage: xdebug
tools: phpunit:${{ matrix.phpunit-versions }} tools: phpunit
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@ -51,9 +45,9 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ${{ steps.composer-cache.outputs.dir }} 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: | restore-keys: |
${{ runner.os }}-php-${{ matrix.php-version }}-composer- ${{ runner.os }}-php-8.3-composer-
- name: Install Composer Dependencies - name: Install Composer Dependencies
run: composer install --quiet --no-ansi --no-interaction --no-progress run: composer install --quiet --no-ansi --no-interaction --no-progress

90
composer.lock generated
View file

@ -653,16 +653,16 @@
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
"version": "2.0.9", "version": "2.0.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/inflector.git", "url": "https://github.com/doctrine/inflector.git",
"reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65" "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65", "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
"reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65", "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -724,7 +724,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/inflector/issues", "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": [ "funding": [
{ {
@ -740,7 +740,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-15T18:05:13+00:00" "time": "2024-02-18T20:23:39+00:00"
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
@ -1944,16 +1944,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v10.44.0", "version": "v10.45.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "1199dbe361787bbe9648131a79f53921b4148cf6" "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/1199dbe361787bbe9648131a79f53921b4148cf6", "url": "https://api.github.com/repos/laravel/framework/zipball/dcf5d1d722b84ad38a5e053289130b6962f830bd",
"reference": "1199dbe361787bbe9648131a79f53921b4148cf6", "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2146,20 +2146,20 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "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", "name": "laravel/horizon",
"version": "v5.23.0", "version": "v5.23.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/horizon.git", "url": "https://github.com/laravel/horizon.git",
"reference": "0b1bf46b21c397fdbe80b1ab54451fd227934508" "reference": "7475de7eb5b465c2da84218002fe1a62b8175da0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/horizon/zipball/0b1bf46b21c397fdbe80b1ab54451fd227934508", "url": "https://api.github.com/repos/laravel/horizon/zipball/7475de7eb5b465c2da84218002fe1a62b8175da0",
"reference": "0b1bf46b21c397fdbe80b1ab54451fd227934508", "reference": "7475de7eb5b465c2da84218002fe1a62b8175da0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2222,9 +2222,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/laravel/horizon/issues", "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", "name": "laravel/prompts",
@ -9848,16 +9848,16 @@
}, },
{ {
"name": "laravel/dusk", "name": "laravel/dusk",
"version": "v7.12.1", "version": "v7.12.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/dusk.git", "url": "https://github.com/laravel/dusk.git",
"reference": "e7c2509034753dd4b2339b082884eef357673bf7" "reference": "676df11326c29d11ee566cd046f8e49e0ce6eb0a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/dusk/zipball/e7c2509034753dd4b2339b082884eef357673bf7", "url": "https://api.github.com/repos/laravel/dusk/zipball/676df11326c29d11ee566cd046f8e49e0ce6eb0a",
"reference": "e7c2509034753dd4b2339b082884eef357673bf7", "reference": "676df11326c29d11ee566cd046f8e49e0ce6eb0a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9918,22 +9918,22 @@
], ],
"support": { "support": {
"issues": "https://github.com/laravel/dusk/issues", "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", "name": "laravel/pint",
"version": "v1.13.11", "version": "v1.14.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/pint.git", "url": "https://github.com/laravel/pint.git",
"reference": "60a163c3e7e3346a1dec96d3e6f02e6465452552" "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/pint/zipball/60a163c3e7e3346a1dec96d3e6f02e6465452552", "url": "https://api.github.com/repos/laravel/pint/zipball/6b127276e3f263f7bb17d5077e9e0269e61b2a0e",
"reference": "60a163c3e7e3346a1dec96d3e6f02e6465452552", "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9986,20 +9986,20 @@
"issues": "https://github.com/laravel/pint/issues", "issues": "https://github.com/laravel/pint/issues",
"source": "https://github.com/laravel/pint" "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", "name": "laravel/sail",
"version": "v1.27.4", "version": "v1.28.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/sail.git", "url": "https://github.com/laravel/sail.git",
"reference": "3047e1a157fad968cc5f6e620d5cbe5c0867fffd" "reference": "a05861ca9b04558b1ec1f36cff521a271a259b6c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/3047e1a157fad968cc5f6e620d5cbe5c0867fffd", "url": "https://api.github.com/repos/laravel/sail/zipball/a05861ca9b04558b1ec1f36cff521a271a259b6c",
"reference": "3047e1a157fad968cc5f6e620d5cbe5c0867fffd", "reference": "a05861ca9b04558b1ec1f36cff521a271a259b6c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10048,7 +10048,7 @@
"issues": "https://github.com/laravel/sail/issues", "issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail" "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", "name": "maximebf/debugbar",
@ -11277,21 +11277,21 @@
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "1.8.0", "version": "1.8.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" "reference": "153ae662783729388a584b4361f2545e4d841e3c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
"reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", "reference": "153ae662783729388a584b4361f2545e4d841e3c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/deprecations": "^1.0", "doctrine/deprecations": "^1.0",
"php": "^7.4 || ^8.0", "php": "^7.3 || ^8.0",
"phpdocumentor/reflection-common": "^2.0", "phpdocumentor/reflection-common": "^2.0",
"phpstan/phpdoc-parser": "^1.13" "phpstan/phpdoc-parser": "^1.13"
}, },
@ -11329,9 +11329,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": { "support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues", "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", "name": "phpstan/phpdoc-parser",
@ -13619,16 +13619,16 @@
}, },
{ {
"name": "vimeo/psalm", "name": "vimeo/psalm",
"version": "5.22.1", "version": "5.22.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vimeo/psalm.git", "url": "https://github.com/vimeo/psalm.git",
"reference": "e9dad66e11274315dac27e08349c628c7d6a1a43" "reference": "d768d914152dbbf3486c36398802f74e80cfde48"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vimeo/psalm/zipball/e9dad66e11274315dac27e08349c628c7d6a1a43", "url": "https://api.github.com/repos/vimeo/psalm/zipball/d768d914152dbbf3486c36398802f74e80cfde48",
"reference": "e9dad66e11274315dac27e08349c628c7d6a1a43", "reference": "d768d914152dbbf3486c36398802f74e80cfde48",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -13725,7 +13725,7 @@
"issues": "https://github.com/vimeo/psalm/issues", "issues": "https://github.com/vimeo/psalm/issues",
"source": "https://github.com/vimeo/psalm" "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", "name": "zbateson/mail-mime-parser",

11
config/app.php
View file

@ -144,17 +144,6 @@ return [
// 'store' => 'redis', // 'store' => 'redis',
], ],
/*
|--------------------------------------------------------------------------
| Font Link
|--------------------------------------------------------------------------
|
| Which URL should the app load custom fonts from
|
*/
'font_link' => env('FONT_LINK'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Autoloaded Service Providers | Autoloaded Service Providers

6
public/assets/css/variables.css
View file

@ -1,8 +1,8 @@
:root { :root {
/* Font Family */ /* Font Family */
--font-family-headings: "Archer SSm A", "Archer SSm B", serif; --font-family-headings: Rockwell, 'Rockwell Nova', 'Roboto Slab', 'DejaVu Serif', 'Sitka Small', serif;
--font-family-body: "Verlag A", "Verlag B", sans-serif; --font-family-body: Charter, 'Bitstream Charter', 'Sitka Text', Cambria, serif;
--font-family-monospace: "Operator Mono SSm A", "Operator Mono SSm B", monospace; --font-family-monospace: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace;;
/* Font Size */ /* Font Size */
--font-size-sm: 0.75rem; /* 12px */ --font-size-sm: 0.75rem; /* 12px */

3
resources/views/master.blade.php
View file

@ -4,9 +4,6 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<title>@yield('title'){{ config('app.name') }}</title> <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/highlight/zenburn.css">
<link rel="stylesheet" href="/assets/css/app.css"> <link rel="stylesheet" href="/assets/css/app.css">
<link rel="alternate" type="application/rss+xml" title="Blog RSS Feed" href="/blog/feed.rss"> <link rel="alternate" type="application/rss+xml" title="Blog RSS Feed" href="/blog/feed.rss">