From: SoarinFerret <redacted>
Date: Tue, 14 Jan 2020 19:50:29 +0000 (-0600)
Subject: Add close icon to notifications
X-Git-Tag: v0.28.0~1^2~8^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/pull/1845/head?ds=inline

Add close icon to notifications
---

diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 8ccf6cbdc..6ef53b719 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -15,7 +15,7 @@
   transition: transform ease-in-out 280ms;
   transform: translateX(580px);
   display: grid;
-  grid-template-columns: 42px 1fr;
+  grid-template-columns: 42px 1fr 12px;
   color: #444;
   font-weight: 700;
   span, svg {
@@ -29,6 +29,13 @@
     padding-right: $-s;
     fill: currentColor;
   }
+  .dismiss {
+    margin-top: -8px;
+    svg {
+      height: 1.0rem;
+      color: #444;
+    }
+  }
   span {
     vertical-align: middle;
     line-height: 1.3;
diff --git a/resources/views/partials/notifications.blade.php b/resources/views/partials/notifications.blade.php
index 526871499..752920917 100644
--- a/resources/views/partials/notifications.blade.php
+++ b/resources/views/partials/notifications.blade.php
@@ -1,11 +1,11 @@
 <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 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 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>