colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1845 from SoarinFerret/add-close-icon-to-notifications 

Add close icon to notifications
This commit is contained in:
Dan Brown 2020-01-19 16:07:08 +00:00 committed by GitHub
parent 5ff89a1abb 4297d64e29
commit 82a8db3739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/sass/_components.scss
View File

@ -15,7 +15,7 @@
transition: transform ease-in-out 280ms; transition: transform ease-in-out 280ms;
transform: translateX(580px); transform: translateX(580px);
display: grid; display: grid;
grid-template-columns: 42px 1fr; grid-template-columns: 42px 1fr 12px;
color: #444; color: #444;
font-weight: 700; font-weight: 700;
span, svg { span, svg {
@ -29,6 +29,13 @@
padding-right: $-s; padding-right: $-s;
fill: currentColor; fill: currentColor;
} }
.dismiss {
margin-top: -8px;
svg {
height: 1.0rem;
color: #444;
}
}
span { span {
vertical-align: middle; vertical-align: middle;
line-height: 1.3; line-height: 1.3;

6
resources/views/partials/notifications.blade.php
View File

@ -1,11 +1,11 @@
<div notification="success" style="display: none;" data-autohide class="pos" role="alert" @if(session()->has('success')) data-show @endif> <div notification="success" style="display: none;" data-autohide class="pos" role="alert" @if(session()->has('success')) data-show @endif>
@icon('check-circle') <span>{!! nl2br(htmlentities(session()->get('success'))) !!}</span> @icon('check-circle') <span>{!! nl2br(htmlentities(session()->get('success'))) !!}</span><div class="dismiss">@icon('close')</div>
</div> </div>
<div notification="warning" style="display: none;" class="warning" role="alert" @if(session()->has('warning')) data-show @endif> <div notification="warning" style="display: none;" class="warning" role="alert" @if(session()->has('warning')) data-show @endif>
@icon('info') <span>{!! nl2br(htmlentities(session()->get('warning'))) !!}</span> @icon('info') <span>{!! nl2br(htmlentities(session()->get('warning'))) !!}</span><div class="dismiss">@icon('close')</div>
</div> </div>
<div notification="error" style="display: none;" class="neg" role="alert" @if(session()->has('error')) data-show @endif> <div notification="error" style="display: none;" class="neg" role="alert" @if(session()->has('error')) data-show @endif>
@icon('danger') <span>{!! nl2br(htmlentities(session()->get('error'))) !!}</span> @icon('danger') <span>{!! nl2br(htmlentities(session()->get('error'))) !!}</span><div class="dismiss">@icon('close')</div>
</div> </div>