remove duplicated font-files

This commit is contained in:
Gamerboy59 2023-09-27 00:07:33 +02:00 committed by GitHub
parent 5ce233bfb8
commit 642293016f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 17 additions and 8771 deletions

View file

@ -11,18 +11,18 @@
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^8.1", "php": "^8.1",
"guzzlehttp/guzzle": "^7.7", "guzzlehttp/guzzle": "^7.8",
"laravel/framework": "^10", "laravel/framework": "^10",
"laravel/tinker": "^2.8", "laravel/tinker": "^2.8",
"laravel/ui": "^4.2", "laravel/ui": "^4.2",
"yajra/laravel-datatables-oracle": "~10.7", "yajra/laravel-datatables-oracle": "~10.8",
"ext-json": "*", "ext-json": "*",
"doctrine/dbal": "v3.6" "doctrine/dbal": "^3"
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.23", "fakerphp/faker": "^1.23",
"laravel/breeze": "^1.22", "laravel/breeze": "^1.24",
"laravel/sail": "^1.23", "laravel/sail": "^1.25",
"mockery/mockery": "^1.6", "mockery/mockery": "^1.6",
"nunomaduro/collision": "^7", "nunomaduro/collision": "^7",
"phpunit/phpunit": "^10", "phpunit/phpunit": "^10",

View file

@ -12,13 +12,13 @@
}, },
"devDependencies": { "devDependencies": {
"axios": "^0.27.2", "axios": "^0.27.2",
"bootstrap": "^5.3.1", "bootstrap": "^5.3.2",
"bootstrap-dark-5": "^1.1.3", "bootstrap-dark-5": "^1.1.3",
"bootstrap-data-table": "^1.0.0", "bootstrap-data-table": "^1.0.0",
"datatables": "^1.10.18", "datatables": "^1.10.18",
"datatables.net-bs": "^1.13.6", "datatables.net-bs": "^1.13.6",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"jquery": "^3.7.0", "jquery": "^3.7.1",
"laravel-mix": "^6.0.49", "laravel-mix": "^6.0.49",
"vue": "^2.7.14", "vue": "^2.7.14",
"vue-loader": "^17.2.2", "vue-loader": "^17.2.2",

Binary file not shown.

File diff suppressed because it is too large Load diff

Before

Width:  |  Height:  |  Size: 730 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load diff

Before

Width:  |  Height:  |  Size: 896 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1,3 +1,2 @@
@import '~@fortawesome/fontawesome-free/css/all.min.css';
@import "datatables.net-bs5"; @import "datatables.net-bs5";
@import "style.css"; @import "style.css";

View file

@ -1,7 +1,2 @@
// Body // FontAwesome
$body-bg: #f8fafc; $fa-font-path: "webfonts";
// Typography
$font-family-sans-serif: 'Nunito', sans-serif;
$font-size-base: 0.9rem;
$line-height-base: 1.6;

View file

@ -1,8 +1,7 @@
// Fonts // FontAwesome
@import url('https://fonts.googleapis.com/css?family=Nunito'); @import "~@fortawesome/fontawesome-free/scss/fontawesome";
@import "~@fortawesome/fontawesome-free/scss/regular";
@import "~@fortawesome/fontawesome-free/scss/solid";
// Variables // Variables
@import 'variables'; @import 'variables';
// Bootstrap
@import '~bootstrap/scss/bootstrap';

6
webpack.mix.js vendored
View file

@ -11,9 +11,7 @@ const mix = require('laravel-mix');
| |
*/ */
mix.js('resources/js/app.js', 'public/js').postCss('resources/css/app.css', 'public/css', [ mix.js('resources/js/app.js', 'public/js').postCss('resources/css/app.css', 'public/css');
mix.sass('resources/sass/app.scss', 'public/css').copy('node_modules/@fortawesome/fontawesome-free/webfonts', 'public/css/webfonts');
]);
mix.postCss('resources/css/light.css', 'public/css'); mix.postCss('resources/css/light.css', 'public/css');
mix.postCss('resources/css/dark.css', 'public/css'); mix.postCss('resources/css/dark.css', 'public/css');