mirror of
https://github.com/cp6/my-idlers.git
synced 2025-04-11 22:08:36 +00:00
remove duplicated font-files
This commit is contained in:
parent
5ce233bfb8
commit
642293016f
24 changed files with 17 additions and 8771 deletions
|
@ -11,18 +11,18 @@
|
|||
"license": "MIT",
|
||||
"require": {
|
||||
"php": "^8.1",
|
||||
"guzzlehttp/guzzle": "^7.7",
|
||||
"guzzlehttp/guzzle": "^7.8",
|
||||
"laravel/framework": "^10",
|
||||
"laravel/tinker": "^2.8",
|
||||
"laravel/ui": "^4.2",
|
||||
"yajra/laravel-datatables-oracle": "~10.7",
|
||||
"yajra/laravel-datatables-oracle": "~10.8",
|
||||
"ext-json": "*",
|
||||
"doctrine/dbal": "v3.6"
|
||||
"doctrine/dbal": "^3"
|
||||
},
|
||||
"require-dev": {
|
||||
"fakerphp/faker": "^1.23",
|
||||
"laravel/breeze": "^1.22",
|
||||
"laravel/sail": "^1.23",
|
||||
"laravel/breeze": "^1.24",
|
||||
"laravel/sail": "^1.25",
|
||||
"mockery/mockery": "^1.6",
|
||||
"nunomaduro/collision": "^7",
|
||||
"phpunit/phpunit": "^10",
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"axios": "^0.27.2",
|
||||
"bootstrap": "^5.3.1",
|
||||
"bootstrap": "^5.3.2",
|
||||
"bootstrap-dark-5": "^1.1.3",
|
||||
"bootstrap-data-table": "^1.0.0",
|
||||
"datatables": "^1.10.18",
|
||||
"datatables.net-bs": "^1.13.6",
|
||||
"font-awesome": "^4.7.0",
|
||||
"jquery": "^3.7.0",
|
||||
"jquery": "^3.7.1",
|
||||
"laravel-mix": "^6.0.49",
|
||||
"vue": "^2.7.14",
|
||||
"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.
1
resources/css/app.css
vendored
1
resources/css/app.css
vendored
|
@ -1,3 +1,2 @@
|
|||
@import '~@fortawesome/fontawesome-free/css/all.min.css';
|
||||
@import "datatables.net-bs5";
|
||||
@import "style.css";
|
||||
|
|
9
resources/sass/_variables.scss
vendored
9
resources/sass/_variables.scss
vendored
|
@ -1,7 +1,2 @@
|
|||
// Body
|
||||
$body-bg: #f8fafc;
|
||||
|
||||
// Typography
|
||||
$font-family-sans-serif: 'Nunito', sans-serif;
|
||||
$font-size-base: 0.9rem;
|
||||
$line-height-base: 1.6;
|
||||
// FontAwesome
|
||||
$fa-font-path: "webfonts";
|
11
resources/sass/app.scss
vendored
11
resources/sass/app.scss
vendored
|
@ -1,8 +1,7 @@
|
|||
// Fonts
|
||||
@import url('https://fonts.googleapis.com/css?family=Nunito');
|
||||
// FontAwesome
|
||||
@import "~@fortawesome/fontawesome-free/scss/fontawesome";
|
||||
@import "~@fortawesome/fontawesome-free/scss/regular";
|
||||
@import "~@fortawesome/fontawesome-free/scss/solid";
|
||||
|
||||
// Variables
|
||||
@import 'variables';
|
||||
|
||||
// Bootstrap
|
||||
@import '~bootstrap/scss/bootstrap';
|
||||
@import 'variables';
|
8
webpack.mix.js
vendored
8
webpack.mix.js
vendored
|
@ -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/dark.css', 'public/css');
|
||||
mix.postCss('resources/css/dark.css', 'public/css');
|
Loading…
Add table
Reference in a new issue