From 976c88782e2388684d77eaad3c3fdf56df95bc20 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 17 Aug 2023 10:53:30 +0700 Subject: [PATCH 1/3] chore: update package setting (#1) * Update README.md * Update composer.json * Update composer.json --- README.md | 5 ++--- composer.json | 10 +++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3c16edf..1c29a19 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ -# Bootstrap theme for Aire +# Bootstrap 5 theme for Aire - https://github.com/glhd/aire - - https://glhd.github.io/aire/bootstrap ## Installation Install via composer with: ``` -composer require glhd/aire-bootstrap +composer require glhd/aire miteyema/aire-bootstrap5 ``` diff --git a/composer.json b/composer.json index 1e6b33b..e3e7d64 100755 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { - "name": "glhd/aire-bootstrap", - "description": "Bootstrap themes for Aire", + "name": "miteyema/aire-bootstrap5", + "description": "Bootstrap 5 themes for Aire", "keywords": [ "laravel", "forms", @@ -11,6 +11,10 @@ { "name": "Chris Morrell", "homepage": "http://www.cmorrell.com" + }, + { + "name": "Tim Ameye", + "homepage": "http://shiftlock.io" } ], "license": "MIT", @@ -41,7 +45,7 @@ "Galahad\\AireBootstrap\\Tests\\": "tests/" } }, - "minimum-stability": "stable", + "minimum-stability": "dev", "extra": { "laravel": { "providers": [ From abb95337b08e749004a1a6c4bc2e9123fd8f0df9 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 17 Aug 2023 11:11:17 +0700 Subject: [PATCH 2/3] fix: bootstrap 5 classes (#2) * Update README.md * Update composer.json * Update composer.json * fix: bootstrap classes * fix: swap label for file input * fix: file group --- src/AireBootstrapServiceProvider.php | 10 +++------- views/group/input/file.blade.php | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/AireBootstrapServiceProvider.php b/src/AireBootstrapServiceProvider.php index 823735f..38ab8cb 100644 --- a/src/AireBootstrapServiceProvider.php +++ b/src/AireBootstrapServiceProvider.php @@ -26,11 +26,11 @@ public function boot() 'group_append' => 'input-group-append', 'group_help_text' => 'form-text text-muted', 'group_errors' => '', - 'label' => '', + 'label' => 'form-label', 'input' => 'form-control', - 'checkbox' => 'custom-control-input', - 'checkbox_label' => 'custom-control-label', + 'checkbox' => 'form-check-input', + 'checkbox_label' => 'form-check-label', 'checkbox_wrapper' => 'custom-control custom-checkbox', 'checkbox_group' => 'custom-control-input', @@ -147,10 +147,6 @@ public function boot() $input->attributes->registerMutator('class', function (ClassNames $classNames) use ($input) { if ('file' === $input->attributes->get('type')) { - $classNames - ->remove('form-control') - ->add('custom-file-input'); - $input ->groupAddClass('custom-file') ->groupRemoveClass('form-group'); diff --git a/views/group/input/file.blade.php b/views/group/input/file.blade.php index c30dca0..88e51a1 100644 --- a/views/group/input/file.blade.php +++ b/views/group/input/file.blade.php @@ -14,8 +14,8 @@ @endif
- {{ $element }} {{ $label }} + {{ $element }}
@if($append) From c358cd46f6a8d27cce85354c60ba6224177a6b9e Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 31 Jul 2024 09:38:50 +0700 Subject: [PATCH 3/3] fix: laravel 11 support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e3e7d64..96a0052 100755 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "require": { "php": ">=7.1", "glhd/aire": "^2.0", - "illuminate/support": "^5.7|^6.0|^7.0|^8.0|^9.0|^10.0" + "illuminate/support": "^5.7|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0" }, "require-dev": { "orchestra/testbench": "~3.0|~4.0|~5.0|~6.0",