Upgrade to the latest sass, mr hope's gulp-sass, the bootstrap 5.2 beta and the latest font awesome, update other dependencies, organize styles a bit better, and use pxrem on the error page

This commit is contained in:
Kevin MacMartin 2022-07-06 13:44:25 -04:00
parent b2e8a5cf86
commit 23a1bf6ab8
17 changed files with 1483 additions and 1383 deletions

259
composer.lock generated
View file

@ -236,16 +236,16 @@
},
{
"name": "doctrine/dbal",
"version": "3.3.6",
"version": "3.3.7",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21"
"reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
"reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
"reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
"shasum": ""
},
"require": {
@ -260,11 +260,11 @@
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2022.1",
"phpstan/phpstan": "1.6.3",
"phpstan/phpstan": "1.7.13",
"phpstan/phpstan-strict-rules": "^1.2",
"phpunit/phpunit": "9.5.20",
"psalm/plugin-phpunit": "0.16.1",
"squizlabs/php_codesniffer": "3.6.2",
"squizlabs/php_codesniffer": "3.7.0",
"symfony/cache": "^5.2|^6.0",
"symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
"vimeo/psalm": "4.23.0"
@ -327,7 +327,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.3.6"
"source": "https://github.com/doctrine/dbal/tree/3.3.7"
},
"funding": [
{
@ -343,7 +343,7 @@
"type": "tidelift"
}
],
"time": "2022-05-02T17:21:01+00:00"
"time": "2022-06-13T21:43:03+00:00"
},
{
"name": "doctrine/deprecations",
@ -760,16 +760,16 @@
},
{
"name": "egulias/email-validator",
"version": "3.2",
"version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
"reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286"
"reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a5ed8d58ed0c340a7c2109f587951b1c84cf6286",
"reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715",
"reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715",
"shasum": ""
},
"require": {
@ -816,7 +816,7 @@
],
"support": {
"issues": "https://github.com/egulias/EmailValidator/issues",
"source": "https://github.com/egulias/EmailValidator/tree/3.2"
"source": "https://github.com/egulias/EmailValidator/tree/3.2.1"
},
"funding": [
{
@ -824,7 +824,7 @@
"type": "github"
}
],
"time": "2022-05-28T22:19:18+00:00"
"time": "2022-06-18T20:57:19+00:00"
},
{
"name": "erusev/parsedown",
@ -1062,22 +1062,22 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "7.4.4",
"version": "7.4.5",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8"
"reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
"reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
"reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.5",
"guzzlehttp/psr7": "^1.8.3 || ^2.1",
"guzzlehttp/psr7": "^1.9 || ^2.4",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@ -1166,7 +1166,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.4.4"
"source": "https://github.com/guzzle/guzzle/tree/7.4.5"
},
"funding": [
{
@ -1182,7 +1182,7 @@
"type": "tidelift"
}
],
"time": "2022-06-09T21:39:15+00:00"
"time": "2022-06-20T22:16:13+00:00"
},
{
"name": "guzzlehttp/promises",
@ -1270,16 +1270,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "2.3.0",
"version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee"
"reference": "13388f00956b1503577598873fffb5ae994b5737"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/83260bb50b8fc753c72d14dc1621a2dac31877ee",
"reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
"reference": "13388f00956b1503577598873fffb5ae994b5737",
"shasum": ""
},
"require": {
@ -1303,7 +1303,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.3-dev"
"dev-master": "2.4-dev"
}
},
"autoload": {
@ -1365,7 +1365,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.3.0"
"source": "https://github.com/guzzle/psr7/tree/2.4.0"
},
"funding": [
{
@ -1381,7 +1381,7 @@
"type": "tidelift"
}
],
"time": "2022-06-09T08:26:02+00:00"
"time": "2022-06-20T21:43:11+00:00"
},
{
"name": "intervention/image",
@ -1469,16 +1469,16 @@
},
{
"name": "laravel/framework",
"version": "v9.17.0",
"version": "v9.19.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "091e287678ac723c591509ca6374e4ded4a99b1c"
"reference": "bbce25bd823133f6a5a724f2d62680b711f1d0df"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/091e287678ac723c591509ca6374e4ded4a99b1c",
"reference": "091e287678ac723c591509ca6374e4ded4a99b1c",
"url": "https://api.github.com/repos/laravel/framework/zipball/bbce25bd823133f6a5a724f2d62680b711f1d0df",
"reference": "bbce25bd823133f6a5a724f2d62680b711f1d0df",
"shasum": ""
},
"require": {
@ -1490,7 +1490,7 @@
"fruitcake/php-cors": "^1.2",
"laravel/serializable-closure": "^1.0",
"league/commonmark": "^2.2",
"league/flysystem": "^3.0",
"league/flysystem": "^3.0.16",
"monolog/monolog": "^2.0",
"nesbot/carbon": "^2.53.1",
"php": "^8.0.2",
@ -1566,7 +1566,7 @@
"pda/pheanstalk": "^4.0",
"phpstan/phpstan": "^1.4.7",
"phpunit/phpunit": "^9.5.8",
"predis/predis": "^1.1.9",
"predis/predis": "^1.1.9|^2.0",
"symfony/cache": "^6.0"
},
"suggest": {
@ -1592,7 +1592,7 @@
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
"phpunit/phpunit": "Required to use assertions and run tests (^9.5.8).",
"predis/predis": "Required to use the predis connector (^1.1.9).",
"predis/predis": "Required to use the predis connector (^1.1.9|^2.0).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^6.0).",
@ -1644,7 +1644,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2022-06-07T15:09:32+00:00"
"time": "2022-06-28T14:33:19+00:00"
},
{
"name": "laravel/helpers",
@ -2146,16 +2146,16 @@
},
{
"name": "league/flysystem",
"version": "3.0.21",
"version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "8f1fcf9d2304ff77a006aa36dd2cb5f236999b12"
"reference": "34a68067b7ae3b836ea5e57e1fc432478372a4f5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8f1fcf9d2304ff77a006aa36dd2cb5f236999b12",
"reference": "8f1fcf9d2304ff77a006aa36dd2cb5f236999b12",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/34a68067b7ae3b836ea5e57e1fc432478372a4f5",
"reference": "34a68067b7ae3b836ea5e57e1fc432478372a4f5",
"shasum": ""
},
"require": {
@ -2216,7 +2216,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.0.21"
"source": "https://github.com/thephpleague/flysystem/tree/3.1.0"
},
"funding": [
{
@ -2232,7 +2232,7 @@
"type": "tidelift"
}
],
"time": "2022-06-12T17:54:28+00:00"
"time": "2022-06-29T17:29:54+00:00"
},
{
"name": "league/mime-type-detection",
@ -2636,16 +2636,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.58.0",
"version": "2.59.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055"
"reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055",
"reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a9000603ea337c8df16cc41f8b6be95a65f4d0f5",
"reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5",
"shasum": ""
},
"require": {
@ -2660,11 +2660,12 @@
"doctrine/orm": "^2.7",
"friendsofphp/php-cs-fixer": "^3.0",
"kylekatarnls/multi-tester": "^2.0",
"ondrejmirtes/better-reflection": "*",
"phpmd/phpmd": "^2.9",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.54 || ^1.0",
"phpunit/php-file-iterator": "^2.0.5",
"phpunit/phpunit": "^7.5.20 || ^8.5.23",
"phpstan/phpstan": "^0.12.99 || ^1.7.14",
"phpunit/php-file-iterator": "^2.0.5 || ^3.0.6",
"phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
"squizlabs/php_codesniffer": "^3.4"
},
"bin": [
@ -2721,15 +2722,19 @@
},
"funding": [
{
"url": "https://opencollective.com/Carbon",
"type": "open_collective"
"url": "https://github.com/sponsors/kylekatarnls",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
"url": "https://opencollective.com/Carbon#sponsor",
"type": "opencollective"
},
{
"url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme",
"type": "tidelift"
}
],
"time": "2022-04-25T19:31:17+00:00"
"time": "2022-06-29T21:43:55+00:00"
},
{
"name": "nette/schema",
@ -3524,16 +3529,16 @@
},
{
"name": "psy/psysh",
"version": "v0.11.5",
"version": "v0.11.6",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "c23686f9c48ca202710dbb967df8385a952a2daf"
"reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf",
"reference": "c23686f9c48ca202710dbb967df8385a952a2daf",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/3f5b5f8aaa979fbd0d1783173f4c82ad529fe621",
"reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621",
"shasum": ""
},
"require": {
@ -3594,9 +3599,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.11.5"
"source": "https://github.com/bobthecow/psysh/tree/v0.11.6"
},
"time": "2022-05-27T18:03:49+00:00"
"time": "2022-07-03T16:40:23+00:00"
},
{
"name": "ralouphie/getallheaders",
@ -3887,16 +3892,16 @@
},
{
"name": "symfony/console",
"version": "v6.1.1",
"version": "v6.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "6187424023fbffcd757789aeb517c9161b1eabee"
"reference": "7a86c1c42fbcb69b59768504c7bca1d3767760b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/6187424023fbffcd757789aeb517c9161b1eabee",
"reference": "6187424023fbffcd757789aeb517c9161b1eabee",
"url": "https://api.github.com/repos/symfony/console/zipball/7a86c1c42fbcb69b59768504c7bca1d3767760b7",
"reference": "7a86c1c42fbcb69b59768504c7bca1d3767760b7",
"shasum": ""
},
"require": {
@ -3963,7 +3968,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v6.1.1"
"source": "https://github.com/symfony/console/tree/v6.1.2"
},
"funding": [
{
@ -3979,7 +3984,7 @@
"type": "tidelift"
}
],
"time": "2022-06-08T14:02:09+00:00"
"time": "2022-06-26T13:01:30+00:00"
},
{
"name": "symfony/css-selector",
@ -4048,7 +4053,7 @@
},
{
"name": "symfony/deprecation-contracts",
"version": "v3.1.0",
"version": "v3.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
@ -4095,7 +4100,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.1"
},
"funding": [
{
@ -4269,7 +4274,7 @@
},
{
"name": "symfony/event-dispatcher-contracts",
"version": "v3.1.0",
"version": "v3.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
@ -4328,7 +4333,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.1.0"
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.1.1"
},
"funding": [
{
@ -4412,16 +4417,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v6.1.1",
"version": "v6.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "a58dc88d56e04e57993d96c1407a17407610e1df"
"reference": "86119d294e51afe4d8e07da96b63332bd1f3f52c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/a58dc88d56e04e57993d96c1407a17407610e1df",
"reference": "a58dc88d56e04e57993d96c1407a17407610e1df",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/86119d294e51afe4d8e07da96b63332bd1f3f52c",
"reference": "86119d294e51afe4d8e07da96b63332bd1f3f52c",
"shasum": ""
},
"require": {
@ -4464,7 +4469,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v6.1.1"
"source": "https://github.com/symfony/http-foundation/tree/v6.1.2"
},
"funding": [
{
@ -4480,20 +4485,20 @@
"type": "tidelift"
}
],
"time": "2022-05-31T14:28:03+00:00"
"time": "2022-06-19T13:21:48+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v6.1.1",
"version": "v6.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "86c4d6f6c5b6cd012df41e3b950c924b3ffdc019"
"reference": "8aaede489900dda61aee208557f63bfa1bca0877"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/86c4d6f6c5b6cd012df41e3b950c924b3ffdc019",
"reference": "86c4d6f6c5b6cd012df41e3b950c924b3ffdc019",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/8aaede489900dda61aee208557f63bfa1bca0877",
"reference": "8aaede489900dda61aee208557f63bfa1bca0877",
"shasum": ""
},
"require": {
@ -4574,7 +4579,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v6.1.1"
"source": "https://github.com/symfony/http-kernel/tree/v6.1.2"
},
"funding": [
{
@ -4590,20 +4595,20 @@
"type": "tidelift"
}
],
"time": "2022-06-09T17:31:33+00:00"
"time": "2022-06-26T17:06:14+00:00"
},
{
"name": "symfony/mailer",
"version": "v6.1.1",
"version": "v6.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailer.git",
"reference": "db6a19a5c896139901c2de59fc9849379e0ff3b6"
"reference": "8fa150355115ea09238858ae3cfaf249fd1fd5ed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mailer/zipball/db6a19a5c896139901c2de59fc9849379e0ff3b6",
"reference": "db6a19a5c896139901c2de59fc9849379e0ff3b6",
"url": "https://api.github.com/repos/symfony/mailer/zipball/8fa150355115ea09238858ae3cfaf249fd1fd5ed",
"reference": "8fa150355115ea09238858ae3cfaf249fd1fd5ed",
"shasum": ""
},
"require": {
@ -4648,7 +4653,7 @@
"description": "Helps sending emails",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/mailer/tree/v6.1.1"
"source": "https://github.com/symfony/mailer/tree/v6.1.2"
},
"funding": [
{
@ -4664,7 +4669,7 @@
"type": "tidelift"
}
],
"time": "2022-06-06T19:15:01+00:00"
"time": "2022-06-19T13:21:48+00:00"
},
{
"name": "symfony/mime",
@ -5553,16 +5558,16 @@
},
{
"name": "symfony/service-contracts",
"version": "v3.1.0",
"version": "v3.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "d66cd8ab656780f62c4215b903a420eb86358957"
"reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/d66cd8ab656780f62c4215b903a420eb86358957",
"reference": "d66cd8ab656780f62c4215b903a420eb86358957",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/925e713fe8fcacf6bc05e936edd8dd5441a21239",
"reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239",
"shasum": ""
},
"require": {
@ -5618,7 +5623,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/v3.1.0"
"source": "https://github.com/symfony/service-contracts/tree/v3.1.1"
},
"funding": [
{
@ -5634,20 +5639,20 @@
"type": "tidelift"
}
],
"time": "2022-05-07T08:07:09+00:00"
"time": "2022-05-30T19:18:58+00:00"
},
{
"name": "symfony/string",
"version": "v6.1.0",
"version": "v6.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "d3edc75baf9f1d4f94879764dda2e1ac33499529"
"reference": "1903f2879875280c5af944625e8246d81c2f0604"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/d3edc75baf9f1d4f94879764dda2e1ac33499529",
"reference": "d3edc75baf9f1d4f94879764dda2e1ac33499529",
"url": "https://api.github.com/repos/symfony/string/zipball/1903f2879875280c5af944625e8246d81c2f0604",
"reference": "1903f2879875280c5af944625e8246d81c2f0604",
"shasum": ""
},
"require": {
@ -5703,7 +5708,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v6.1.0"
"source": "https://github.com/symfony/string/tree/v6.1.2"
},
"funding": [
{
@ -5719,7 +5724,7 @@
"type": "tidelift"
}
],
"time": "2022-04-22T08:18:23+00:00"
"time": "2022-06-26T16:35:04+00:00"
},
{
"name": "symfony/translation",
@ -5819,16 +5824,16 @@
},
{
"name": "symfony/translation-contracts",
"version": "v3.1.0",
"version": "v3.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
"reference": "bfddd2a1faa271b782b791c361cc16e2dd49dfaa"
"reference": "606be0f48e05116baef052f7f3abdb345c8e02cc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/bfddd2a1faa271b782b791c361cc16e2dd49dfaa",
"reference": "bfddd2a1faa271b782b791c361cc16e2dd49dfaa",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/606be0f48e05116baef052f7f3abdb345c8e02cc",
"reference": "606be0f48e05116baef052f7f3abdb345c8e02cc",
"shasum": ""
},
"require": {
@ -5880,7 +5885,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/translation-contracts/tree/v3.1.0"
"source": "https://github.com/symfony/translation-contracts/tree/v3.1.1"
},
"funding": [
{
@ -5896,7 +5901,7 @@
"type": "tidelift"
}
],
"time": "2022-04-22T07:30:54+00:00"
"time": "2022-06-27T17:24:16+00:00"
},
{
"name": "symfony/var-dumper",
@ -6567,16 +6572,16 @@
},
{
"name": "laravel/sail",
"version": "v1.14.10",
"version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
"reference": "0ea5d683af4d189071efcdb9e83946c10dab82c3"
"reference": "676e1ff33c1b8af657779f62f57360c376cba666"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/0ea5d683af4d189071efcdb9e83946c10dab82c3",
"reference": "0ea5d683af4d189071efcdb9e83946c10dab82c3",
"url": "https://api.github.com/repos/laravel/sail/zipball/676e1ff33c1b8af657779f62f57360c376cba666",
"reference": "676e1ff33c1b8af657779f62f57360c376cba666",
"shasum": ""
},
"require": {
@ -6623,7 +6628,7 @@
"issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail"
},
"time": "2022-06-09T07:10:28+00:00"
"time": "2022-06-24T13:56:11+00:00"
},
{
"name": "mockery/mockery",
@ -6758,16 +6763,16 @@
},
{
"name": "nunomaduro/collision",
"version": "v6.2.0",
"version": "v6.2.1",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
"reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25"
"reference": "5f058f7e39278b701e455b3c82ec5298cf001d89"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/c379636dc50e829edb3a8bcb944a01aa1aed8f25",
"reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/5f058f7e39278b701e455b3c82ec5298cf001d89",
"reference": "5f058f7e39278b701e455b3c82ec5298cf001d89",
"shasum": ""
},
"require": {
@ -6779,6 +6784,7 @@
"require-dev": {
"brianium/paratest": "^6.4.1",
"laravel/framework": "^9.7",
"laravel/pint": "^0.2.1",
"nunomaduro/larastan": "^1.0.2",
"nunomaduro/mock-final-classes": "^1.1.0",
"orchestra/testbench": "^7.3.0",
@ -6841,7 +6847,7 @@
"type": "patreon"
}
],
"time": "2022-04-05T15:31:38+00:00"
"time": "2022-06-27T16:11:16+00:00"
},
{
"name": "phar-io/manifest",
@ -7501,16 +7507,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.20",
"version": "9.5.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
"shasum": ""
},
"require": {
@ -7544,7 +7550,6 @@
"sebastian/version": "^3.0.2"
},
"require-dev": {
"ext-pdo": "*",
"phpspec/prophecy-phpunit": "^2.0.1"
},
"suggest": {
@ -7588,7 +7593,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21"
},
"funding": [
{
@ -7600,7 +7605,7 @@
"type": "github"
}
],
"time": "2022-04-01T12:37:26+00:00"
"time": "2022-06-19T12:14:25+00:00"
},
{
"name": "sebastian/cli-parser",
@ -8774,16 +8779,16 @@
},
{
"name": "spatie/laravel-ignition",
"version": "1.2.4",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-ignition.git",
"reference": "b90026ba26fe6589101dc5cd6527846290560aea"
"reference": "fe37a0eafe6ea040804255c70e9808af13314f87"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/b90026ba26fe6589101dc5cd6527846290560aea",
"reference": "b90026ba26fe6589101dc5cd6527846290560aea",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/fe37a0eafe6ea040804255c70e9808af13314f87",
"reference": "fe37a0eafe6ea040804255c70e9808af13314f87",
"shasum": ""
},
"require": {
@ -8860,7 +8865,7 @@
"type": "github"
}
],
"time": "2022-06-08T07:07:57+00:00"
"time": "2022-06-17T06:28:57+00:00"
},
{
"name": "theseer/tokenizer",

View file

@ -63,7 +63,7 @@ const jsDashboard = [
const jsDashboardLibs = [
"node_modules/jquery/dist/jquery.js",
"node_modules/popper.js/dist/umd/popper.js",
"node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/bootstrap/dist/js/bootstrap.bundle.js",
"node_modules/flatpickr/dist/flatpickr.js",
"node_modules/sortablejs/Sortable.js",
"node_modules/list.js/dist/list.js",

2377
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -8,15 +8,15 @@
"browser-sync": "2.27.10"
},
"dependencies": {
"@babel/core": "7.18.5",
"@babel/preset-env": "7.18.2",
"@fortawesome/fontawesome-free": "5.15.4",
"@mr-hope/gulp-sass": "2.0.0",
"@babel/core": "7.18.6",
"@babel/preset-env": "7.18.6",
"@fortawesome/fontawesome-free": "6.1.1",
"@mr-hope/gulp-sass": "3.0.2",
"autonumeric": "4.6.0",
"autoprefixer": "10.4.5",
"autoprefixer": "10.4.7",
"axios": "0.27.2",
"babel-loader": "8.2.5",
"bootstrap": "5.1.3",
"bootstrap": "5.2.0-beta1",
"easymde": "2.16.1",
"fancy-log": "2.0.0",
"flatpickr": "4.6.13",
@ -35,13 +35,13 @@
"minimist": "1.2.6",
"popper.js": "1.16.1",
"postcss": "8.4.14",
"sass": "1.32.12",
"sass": "1.53.0",
"sortablejs": "1.15.0",
"spinkit": "2.0.1",
"terser-webpack-plugin": "5.3.3",
"vue": "3.2.37",
"vue-loader": "17.0.0",
"vue-router": "4.0.16",
"vue-router": "4.1.1",
"vuex": "4.0.2",
"webpack": "5.73.0",
"what-input": "5.2.12"

View file

@ -0,0 +1,27 @@
//
// Common Variables
//
// Breakpoints
$grid-breakpoints: (
xs: 0,
sm: 576px,
md: 768px,
lg: 992px,
xl: 1200px,
xxl: 1600px,
xxxl: 1950px,
xxxxl: 2150px
);
// Sizes
$container-max-widths: (
sm: pxrem(540),
md: pxrem(720),
lg: pxrem(960),
xl: pxrem(1140),
xxl: pxrem(1540)
);
$grid-gutter-width: pxrem(30);
$half-gutter-width: math.div($grid-gutter-width, 2);

View file

@ -1,26 +1,15 @@
//
// Custom Variables
// Site Variables
//
// Overrides
$grid-breakpoints: (
xs: 0,
sm: 576px,
md: 768px,
lg: 992px,
xl: 1200px,
xxl: 1600px,
xxxl: 1950px,
xxxxl: 2150px
);
// Breakpoints
$nav-desktop-min: 768px;
$nav-mobile-max: ($nav-desktop-min - 1px);
$container-max-widths: (
sm: pxrem(540),
md: pxrem(720),
lg: pxrem(960),
xl: pxrem(1140),
xxl: pxrem(1540)
);
// Sizes
$nav-height-desktop: pxrem(60);
$nav-height-mobile: pxrem(50);
$nav-link-height-mobile: pxrem(50);
// Colours
$c-text: #111; // text
@ -31,13 +20,3 @@ $c-error: #fa2036; // error
// Values
$nav-link-count: 3;
// Sizes
$nav-height-desktop: pxrem(60);
$nav-height-mobile: pxrem(50);
$nav-link-height-mobile: pxrem(50);
$grid-gutter-width: pxrem(30);
// Breakpoints
$nav-desktop-min: 768px;
$nav-mobile-max: ($nav-desktop-min - 1px);

View file

@ -1,16 +1,20 @@
// Sass modules
@use "sass:math";
// Base font size
$base-font-size: 16px;
// Libraries
$enable-smooth-scroll: false;
@import "bootstrap/scss/bootstrap.scss";
// Functions
@import "functions/**/*.scss";
// Core
@import "_var";
@import "_fonts";
// Libraries
$enable-smooth-scroll: false;
@import "bootstrap/scss/bootstrap.scss";
@import "_common-vars";
@import "_site-vars";
// Supplementary
@import "mixins/**/*.scss";

View file

@ -1,3 +1,6 @@
// Sass modules
@use "sass:math";
// Base font size
$base-font-size: 16px;
@ -5,14 +8,17 @@ $base-font-size: 16px;
$fa-font-path: "/fonts";
@import "@fortawesome/fontawesome-free/scss/fontawesome.scss";
@import "@fortawesome/fontawesome-free/scss/solid.scss";
@import "bootstrap/scss/bootstrap.scss";
// Core
@import "_fonts";
$enable-smooth-scroll: false;
@import "bootstrap/scss/bootstrap.scss";
// Functions
@import "functions/**/*.scss";
// Core
@import "_fonts";
@import "_common-vars";
// Supplementary
@import "mixins/**/*.scss";
@ -28,27 +34,6 @@ $c-dashboard-light: #f1f1f1;
$c-dashboard-edit: #87823e;
$c-dashboard-delete: #87483e;
$grid-breakpoints: (
xs: 0,
sm: 576px,
md: 768px,
lg: 992px,
xl: 1200px,
xxl: 1600px,
xxxl: 1950px,
xxxxl: 2150px
);
$container-max-widths: (
sm: pxrem(540),
md: pxrem(720),
lg: pxrem(960),
xl: pxrem(1140),
xxl: pxrem(1540),
xxxl: pxrem(1733),
xxxxl: pxrem(1925)
);
//
// Main Dashboard Styles
//
@ -57,6 +42,19 @@ $container-max-widths: (
outline: none !important;
}
html {
width: 100%;
font-size: $base-font-size;
@include media-breakpoint-up(xxxl) {
font-size: 18px;
}
@include media-breakpoint-up(xxxxl) {
font-size: 20px;
}
}
body {
@include font-sans;
-webkit-font-smoothing: antialiased;
@ -229,7 +227,7 @@ body {
.dashboard-footer {
margin-top: $grid-gutter-width;
width: 100%;
padding: pxrem(8) ($grid-gutter-width / 2);
padding: pxrem(8) $half-gutter-width;
background-color: $c-dashboard-dark;
text-align: right;
@ -298,7 +296,7 @@ body {
width: 100%;
@include media-breakpoint-down(md) {
margin-bottom: ($grid-gutter-width / 2);
margin-bottom: $half-gutter-width;
}
&-input {
@ -649,7 +647,7 @@ body {
}
@include media-breakpoint-up(sm) {
margin-right: ($grid-gutter-width / 2);
margin-right: $half-gutter-width;
}
}
@ -661,7 +659,7 @@ body {
}
@include media-breakpoint-up(sm) {
margin-left: ($grid-gutter-width / 2);
margin-left: $half-gutter-width;
}
}
@ -1162,7 +1160,7 @@ form {
}
.edit-button {
margin-bottom: ($grid-gutter-width / 2);
margin-bottom: $half-gutter-width;
display: inline-block;
padding: pxrem(5) pxrem(10);
border-radius: pxrem(5);
@ -1354,7 +1352,7 @@ form {
@include media-breakpoint-up(md) {
float: none;
margin: ($grid-gutter-width / 2) 0px;
margin: $half-gutter-width 0px;
}
}
}

View file

@ -1,28 +1,62 @@
// Core
@import "_fonts";
// Sass modules
@use "sass:math";
// Base font size
$base-font-size: 16px;
// Libraries
$enable-smooth-scroll: false;
@import "bootstrap/scss/bootstrap.scss";
// Functions
@import "functions/**/*.scss";
// Core
@import "_fonts";
@import "_common-vars";
* {
outline: none !important;
}
html {
width: 100%;
font-size: $base-font-size;
@include media-breakpoint-up(xxxl) {
font-size: 18px;
}
@include media-breakpoint-up(xxxxl) {
font-size: 20px;
}
}
body {
@include font-sans-bold;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-overflow-scrolling: touch;
}
.error-page {
display: flex;
min-height: 100vh;
padding: $grid-gutter-width ($grid-gutter-width / 2);
padding: $grid-gutter-width math.div($grid-gutter-width, 2);
align-items: center;
&-content {
@include font-sans-bold;
width: 100%;
font-size: 22px;
font-size: pxrem(22);
text-align: center;
text-transform: uppercase;
@include media-breakpoint-up(sm) {
font-size: 32px;
font-size: pxrem(32);
}
@include media-breakpoint-up(lg) {
font-size: 48px;
font-size: pxrem(48);
}
}
}

View file

@ -4,5 +4,5 @@
// Usage example: pxrem(32) or pxrem(32px) => 2rem
//
@function pxrem($size) {
@return ((strip-unit($size) / strip-unit($base-font-size)) * 1rem);
@return (math.div(strip-unit($size), strip-unit($base-font-size)) * 1rem);
}

View file

@ -4,5 +4,5 @@
// Usage example: strip-unit(25px) => 25
//
@function strip-unit($value) {
@return ($value / ($value * 0 + 1));
@return math.div($value, $value * 0 + 1);
}

View file

@ -3,6 +3,6 @@
content: "";
display: block;
width: 100%;
padding-top: ($height / $width) * 100%;
padding-top: (math.div($height, $width) * 100%);
}
}

View file

@ -61,7 +61,7 @@
}
&-body {
margin: ($grid-gutter-width / 2) 0px;
margin: $half-gutter-width 0px;
}
&-taglist {

View file

@ -7,17 +7,17 @@
margin-bottom: pxrem(20);
width: 100%;
padding: pxrem(5) pxrem(10);
border: 2px solid fade-out($c-base, 0.75);
border: pxrem(2) solid fade-out($c-base, 0.75);
background-color: rgba(255, 255, 255, 0.8);
font-size: pxrem(14);
transition: border $trans-speed;
&:focus {
border: 2px solid fade-out($c-accent, 0.4);
border: pxrem(2) solid fade-out($c-accent, 0.4);
}
&.error {
border: 2px solid $c-error;
border: pxrem(2) solid $c-error;
}
}

View file

@ -1,6 +1,6 @@
.error-page-component {
display: flex;
padding: $grid-gutter-width ($grid-gutter-width / 2);
padding: $grid-gutter-width $half-gutter-width;
flex-grow: 1;
align-items: center;

View file

@ -22,7 +22,7 @@
&-toggle {
position: absolute;
top: 50%;
right: ($grid-gutter-width / 2);
right: $half-gutter-width;
transform: translateY(-50%);
margin: 0px;
width: pxrem(22);
@ -113,7 +113,7 @@
}
@media (min-width: $nav-desktop-min) {
padding: 0px $grid-gutter-width 0px (($grid-gutter-width / 2) + $desktop-logo-width + $logo-offset);
padding: 0px $grid-gutter-width 0px ($half-gutter-width + $desktop-logo-width + $logo-offset);
}
.navlink {
@ -188,14 +188,14 @@
&-logo {
position: absolute;
top: ($nav-height-mobile / 2);
top: math.div($nav-height-mobile, 2);
left: $logo-offset;
transform: translateY(-50%);
display: inline-block;
width: $mobile-logo-width;
@media (min-width: $nav-desktop-min) {
top: ($nav-height-desktop / 2);
top: math.div($nav-height-desktop, 2);
width: $desktop-logo-width;
}

View file

@ -25,8 +25,8 @@
<div class="image-buttons">
<input id="profile-image-upload" name="profile-image-upload" type="file" />
<label for="profile-image-upload" class="image-upload-button" title="Upload Profile Image"><i class="fas fa-upload"></i></label>
<button id="profile-image-delete" class="image-delete-button {{ $profile_image === null ? 'inactive' : '' }}" title="Delete Profile Image"><i class="fas fa-trash-alt"></i></button>
<label for="profile-image-upload" class="image-upload-button" title="Upload Profile Image"><i class="fa-solid fa-upload"></i></label>
<button id="profile-image-delete" class="image-delete-button {{ $profile_image === null ? 'inactive' : '' }}" title="Delete Profile Image"><i class="fa-solid fa-trash-can"></i></button>
</div>
</form>