From 080c74614020509ee49e42cfe867c8ea9bdb1680 Mon Sep 17 00:00:00 2001
From: Robert-Jan de Dreu <160743+rjd22@users.noreply.github.com>
Date: Sat, 3 Jun 2023 16:16:02 +0200
Subject: [PATCH] fix: #1588 add important alert with title (#1609)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: codecalm <codecalm@gmail.com>
Co-authored-by: Paweł Kuna <1282324+codecalm@users.noreply.github.com>
---
 .changeset/hip-jobs-double.md     |  5 +++
 docs/components/alerts.mdx        | 15 +++++++
 src/pages/_data/menu.yml          |  3 ++
 src/pages/_includes/ui/alert.html | 39 +++++++++++++-----
 src/pages/alerts.html             | 67 +++++++++++++++++++++++++++++++
 src/scss/ui/_alerts.scss          |  9 ++++-
 6 files changed, 127 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/hip-jobs-double.md
 create mode 100644 src/pages/alerts.html

diff --git a/.changeset/hip-jobs-double.md b/.changeset/hip-jobs-double.md
new file mode 100644
index 000000000..0692c94f4
--- /dev/null
+++ b/.changeset/hip-jobs-double.md
@@ -0,0 +1,5 @@
+---
+"@tabler/core": minor
+---
+
+Adding `alerts.html` page with example of alerts.
diff --git a/docs/components/alerts.mdx b/docs/components/alerts.mdx
index 6e5579400..2311ec34f 100644
--- a/docs/components/alerts.mdx
+++ b/docs/components/alerts.mdx
@@ -352,6 +352,21 @@ Add primary and secondary buttons to your alert modals if you want users to take
 If you want your alert to be really eye-catching, you can add a class `alert-important`.
 
 ```html example
+<div class="alert alert-important alert-success alert-dismissible" role="alert">
+  <div class="d-flex">
+    <div>
+		<svg xmlns="http://www.w3.org/2000/svg" class="icon alert-icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+			<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+			<path d="M5 12l5 5l10 -10"></path>
+		</svg>
+    </div>
+    <div>
+		 <h4 class="alert-title">Wow! Everything worked!</h4>
+		 <div class="text-secondary">Your account has been saved!</div>
+    </div>
+  </div>
+  <a class="btn-close btn-close-white" data-bs-dismiss="alert" aria-label="close"></a>
+</div>
 <div class="alert alert-important alert-danger alert-dismissible" role="alert">
   <div class="d-flex">
     <div>
diff --git a/src/pages/_data/menu.yml b/src/pages/_data/menu.yml
index b2b238d4c..6fdf14fac 100644
--- a/src/pages/_data/menu.yml
+++ b/src/pages/_data/menu.yml
@@ -8,6 +8,9 @@ base:
   icon: package
   columns: 2
   children:
+    alerts:
+      title: Alerts
+      url: alerts.html
     accordion:
       title: Accordion
       url: accordion.html
diff --git a/src/pages/_includes/ui/alert.html b/src/pages/_includes/ui/alert.html
index c98ba32a1..a30c7e0ff 100644
--- a/src/pages/_includes/ui/alert.html
+++ b/src/pages/_includes/ui/alert.html
@@ -1,23 +1,44 @@
-<div class="alert{% if include.important %} alert-important{% endif %} alert-{{ include.type | default: 'primary'}}{%if include.close %} alert-dismissible{% endif %}{% if include.avatar %} alert-avatar{% endif %}" role="alert">
+{% assign icon = include.icon %}
+{% unless icon %}
+	{% if include.type == 'success' %}
+		{% assign icon = 'check' %}
+		{% assign title = 'Wow! Everything worked!' %}
+		{% assign description = 'Your account has been saved!' %}
+	{% elsif include.type == 'warning' %}
+		{% assign icon = 'alert-triangle' %}
+		{% assign title = 'Uh oh, something went wrong' %}
+		{% assign description = 'Sorry! There was a problem with your request.' %}
+	{% elsif include.type == 'danger' %}
+		{% assign icon = 'alert-circle' %}
+		{% assign title = "I'm so sorry…" %}
+		{% assign description = 'Something went wrong. Please try again.' %}
+	{% elsif include.type == 'info' %}
+		{% assign icon = 'info-circle' %}
+		{% assign title = 'Did you know?' %}
+		{% assign description = 'Here is something that you might like to know.' %}
+	{% endif %}
+{% endunless %}
 
-	{% if include.icon or include.person-id %}
+<div class="alert{% if include.important %} alert-important{% endif %} alert-{{ include.type | default: 'primary'}}{%if include.show-close %} alert-dismissible{% endif %}{% if include.avatar %} alert-avatar{% endif %}" role="alert">
+
+	{% if include.show-icon or include.person-id %}
 		<div class="d-flex">
 		<div>
 			{% if include.person-id %}{% include ui/avatar.html person-id=include.person-id class="float-start me-3" %}{% endif %}
 
-			{% if include.icon %}
-			{% include ui/icon.html icon=include.icon class="alert-icon" %}
+			{% if include.show-icon %}
+			{% include ui/icon.html icon=icon class="alert-icon" %}
 			{% endif %}
 		</div>
 		<div>
 	{% endif %}
 
 
-	{% if include.description %}
+	{% if include.show-description or include.description %}
 		<h4 class="alert-title">{{ include.text | default: "This is a custom alert box!" }}</h4>
-		<div class="text-secondary">{{ include.description }}</div>
+		<div class="text-secondary">{{ include.description | default: description }}</div>
 	{% else %}
-		{{ include.text | default: "This is a custom alert box!" }}
+		{{ include.title | default: title }}
 	{% endif %}
 
 	{% if include.buttons %}
@@ -27,10 +48,10 @@
 	</div>
 	{% endif %}
 
-	{% if include.icon or include.person-id %}
+	{% if include.show-icon or include.person-id %}
 		</div>
 		</div>
 	{% endif %}
 
-	{% if include.close %}<a class="btn-close{% if include.important %} btn-close-white{% endif %}" data-bs-dismiss="alert" aria-label="close"></a>{% endif %}
+	{% if include.show-close %}<a class="btn-close" data-bs-dismiss="alert" aria-label="close"></a>{% endif %}
 </div>
diff --git a/src/pages/alerts.html b/src/pages/alerts.html
new file mode 100644
index 000000000..1dfe54b5b
--- /dev/null
+++ b/src/pages/alerts.html
@@ -0,0 +1,67 @@
+---
+title: Alerts
+menu: base.alerts
+page-header: Alerts
+---
+
+<div class="row row-cards">
+	<div class="col-lg-6">
+		<div class="card">
+			<div class="card-body">
+				<h2 class="card-title">Basic alerts</h2>
+				<p class="text-secondary">Wrap any text and an optional dismiss button in <code>.alert</code> and one of the four contextual classes (e.g., <code>.alert-success</code>) for basic alert messages.</p>
+				{% include ui/alert.html type="success" %}
+				{% include ui/alert.html type="warning" %}
+				{% include ui/alert.html type="danger" %}
+				{% include ui/alert.html type="info" %}
+			</div>
+		</div>
+	</div>
+	<div class="col-lg-6">
+		<div class="card">
+			<div class="card-body">
+				<h2 class="card-title">Alerts with icon</h2>
+				<p class="text-secondary">Build on any alert by adding an optional icon.</p>
+				{% include ui/alert.html type="success" show-icon=true %}
+				{% include ui/alert.html type="warning" show-icon=true %}
+				{% include ui/alert.html type="danger" show-icon=true %}
+				{% include ui/alert.html type="info" show-icon=true %}
+			</div>
+		</div>
+	</div>
+	<div class="col-lg-6">
+		<div class="card">
+			<div class="card-body">
+				<h2 class="card-title">Dismissible alerts</h2>
+				<p class="text-secondary">Build on any alert by adding an optional <code>.alert-dismissible</code> and close button.</p>
+				{% include ui/alert.html type="success" show-icon=true show-close=true %}
+				{% include ui/alert.html type="warning" show-icon=true show-close=true %}
+				{% include ui/alert.html type="danger" show-icon=true show-close=true %}
+				{% include ui/alert.html type="info" show-icon=true show-close=true %}
+			</div>
+		</div>
+	</div>
+	<div class="col-lg-6">
+		<div class="card">
+			<div class="card-body">
+				<h2 class="card-title">Alert with a description</h2>
+				<p class="text-secondary">Build on any alert by adding an optional <code>.alert-dismissible</code> and close button.</p>
+				{% include ui/alert.html type="success" show-description=true show-icon=true %}
+				{% include ui/alert.html type="warning" show-description=true show-icon=true %}
+				{% include ui/alert.html type="danger" show-description=true show-icon=true %}
+				{% include ui/alert.html type="info" show-description=true show-icon=true %}
+			</div>
+		</div>
+	</div>
+	<div class="col-lg-6">
+		<div class="card">
+			<div class="card-body">
+				<h2 class="card-title">Important alerts</h2>
+				{% include ui/alert.html important=true type="success" show-icon=true show-close=true %}
+				{% include ui/alert.html important=true type="warning" show-icon=true show-close=true %}
+				{% include ui/alert.html important=true type="danger" show-icon=true show-close=true %}
+				{% include ui/alert.html important=true type="info" show-icon=true show-close=true %}
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/scss/ui/_alerts.scss b/src/scss/ui/_alerts.scss
index 5833f283a..bfe66cb36 100644
--- a/src/scss/ui/_alerts.scss
+++ b/src/scss/ui/_alerts.scss
@@ -1,6 +1,6 @@
 .alert {
   --#{$prefix}alert-color: #{var(--#{$prefix}secondary)};
-  background: $white;
+  --tblr-alert-bg: #{var(--#{$prefix}surface)};
   border: $alert-border-width var(--#{$prefix}border-style) $alert-border-color;
   border-left: .25rem var(--#{$prefix}border-style) var(--#{$prefix}alert-color);
   box-shadow: $alert-shadow;
@@ -16,13 +16,18 @@
   color: #fff;
 
   .alert-icon,
-  .alert-link {
+  .alert-link,
+  .alert-title {
     color: inherit;
   }
 
   .alert-link:hover {
     color: inherit;
   }
+
+  .btn-close {
+    filter: var(--#{$prefix}btn-close-white-filter);
+  }
 }
 
 .alert-link, {