Skip to content

Commit

Permalink
Merge branch '5.x' into feature/lazy-child-components
Browse files Browse the repository at this point in the history
  • Loading branch information
luanfreitasdev authored Dec 28, 2023
2 parents 5cfb48f + 5d01000 commit ce32dae
Show file tree
Hide file tree
Showing 21 changed files with 359 additions and 450 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
],
"require": {
"php": "^8.1",
"doctrine/dbal": "^3.7",
"livewire/livewire": "^3.1.0",
"laravel/prompts": "^0.1.13"
},
"require-dev": {
"composer/composer": "^2.6.6",
"laravel/pint": "^1.13.7",
"laradumps/laradumps-core": "^0.3.0",
"laradumps/laradumps-core": "^1.1",
"spaze/phpstan-disallowed-calls": "^2.16.1",
"larastan/larastan": "^2.7",
"pestphp/pest": "^2.28.1",
Expand Down
6 changes: 3 additions & 3 deletions dist/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"/powergrid.js": "/powergrid.js?id=495809d3974beb1d1566c20a3225b674",
"/powergrid.js": "/powergrid.js?id=d96096b65479becbf69b80ca0c298e90",
"/bootstrap5.css": "/bootstrap5.css?id=03aba1df82c23db07c1d1096efcd42ae",
"/tailwind.css": "/tailwind.css?id=479d85eb8b0b8341542e0b979c84f17d",
"/tailwind.css": "/tailwind.css?id=8186118970c318f469b566567b8fa4b9",
"/tom-select.css": "/tom-select.css?id=7af730d2c4bf937316d4002948b1571d",
"/powergrid.css": "/powergrid.css?id=bb04343cd2c37169481dff9b4466d544"
"/powergrid.css": "/powergrid.css?id=46c8d6d54fae0f3baa5b774b1e47ef82"
}
2 changes: 1 addition & 1 deletion dist/powergrid.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/powergrid.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/tailwind.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions resources/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,7 @@ table thead {
.pg-enabled-filters-span {
@apply outline-none inline-flex justify-center items-center rounded gap-x-1 text-xs font-semibold px-2.5 py-0.5 text-pg-primary-600 dark:text-pg-primary-200 bg-pg-primary-100 dark:bg-pg-primary-600
}

select {
background-image: unset !important;
}
4 changes: 4 additions & 0 deletions resources/css/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,7 @@
.pg-enabled-filters-span {
@apply outline-none inline-flex justify-center items-center rounded gap-x-1 text-xs font-semibold px-2.5 py-0.5 text-pg-primary-600 dark:text-pg-primary-200 bg-pg-primary-100 dark:bg-pg-primary-600
}

select {
background-image: unset !important;
}
Loading

0 comments on commit ce32dae

Please sign in to comment.