Skip to content

add bootstrap 5 alert compatibility #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhanyn10 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

add bootstrap 5 alert compatibility #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f78332f
Update message.blade.php
dhanyn10 Apr 11, 2022
d5c6a35
Update Message.php
dhanyn10 Apr 11, 2022
c3e5b39
Update FlashNotifier.php
dhanyn10 Apr 11, 2022
20afca5
Update message.blade.php
dhanyn10 Apr 11, 2022
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
10 changes: 10 additions & 0 deletions src/Laracasts/Flash/FlashNotifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,16 @@ public function important()
{
return $this->updateLastMessage(['important' => true]);
}

/**
* set base css to bootstrap 5.
*
* @return $this
*/
public function bs5()
{
return $this->updateLastMessage(['bootstrap5' => true]);
}

/**
* Clear all registered messages.
Expand Down
6 changes: 6 additions & 0 deletions src/Laracasts/Flash/Message.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ class Message implements \ArrayAccess
*/
public $important = false;

/**
* bootstrap 5 support.
*
* @var bool
*/
public $bs5 = false;
/**
* Whether the message is an overlay.
*
Expand Down
25 changes: 19 additions & 6 deletions src/views/message.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,34 @@
'body' => $message['message']
])
@else
<div class="alert
alert-{{ $message['level'] }}
@if ($message['bootstrap5'])
<div class="alert alert-{{ $message['level'] }}
{{ $message['important'] ? 'alert-dismissible' : '' }}"
role="alert"
>
{!! $message['message'] !!}
@if ($message['important'])
<button type="button"
class="btn-close"
data-bs-dismiss="alert"
aria-label="close"
></button>
@endif
</div>
@else
<div class="alert alert-{{ $message['level'] }}
{{ $message['important'] ? 'alert-important' : '' }}"
role="alert"
>
role="alert">
@if ($message['important'])
<button type="button"
class="close"
data-dismiss="alert"
aria-hidden="true"
>&times;</button>
@endif

{!! $message['message'] !!}
</div>
</div>
@endif
@endif
@endforeach

Expand Down