Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
```
12 changes: 8 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -11,13 +11,17 @@
{
"name": "Chris Morrell",
"homepage": "http://www.cmorrell.com"
},
{
"name": "Tim Ameye",
"homepage": "http://shiftlock.io"
}
],
"license": "MIT",
"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",
Expand All @@ -41,7 +45,7 @@
"Galahad\\AireBootstrap\\Tests\\": "tests/"
}
},
"minimum-stability": "stable",
"minimum-stability": "dev",
"extra": {
"laravel": {
"providers": [
Expand Down
10 changes: 3 additions & 7 deletions src/AireBootstrapServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion views/group/input/file.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
@endif

<div class="custom-file">
{{ $element }}
{{ $label }}
{{ $element }}
</div>

@if($append)
Expand Down