From d60c25c3e13c59bfb626e19619a8210324e128ba Mon Sep 17 00:00:00 2001 From: razonyang Date: Sun, 14 Jan 2024 15:01:58 +0800 Subject: [PATCH] feat(alert): simplify usage with Markdown content --- assets/mods/bootstrap/scss/_alert.scss | 5 +++++ assets/mods/bootstrap/scss/index.scss | 1 + layouts/partials/bootstrap/alert-heading.html | 4 ++-- layouts/partials/bootstrap/alert.html | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 assets/mods/bootstrap/scss/_alert.scss create mode 100644 assets/mods/bootstrap/scss/index.scss diff --git a/assets/mods/bootstrap/scss/_alert.scss b/assets/mods/bootstrap/scss/_alert.scss new file mode 100644 index 0000000..239ad48 --- /dev/null +++ b/assets/mods/bootstrap/scss/_alert.scss @@ -0,0 +1,5 @@ +.alert-content { + > p:last-child { + margin-bottom: 0 !important; + } +} diff --git a/assets/mods/bootstrap/scss/index.scss b/assets/mods/bootstrap/scss/index.scss new file mode 100644 index 0000000..d9f0e5f --- /dev/null +++ b/assets/mods/bootstrap/scss/index.scss @@ -0,0 +1 @@ +@import 'alert'; diff --git a/layouts/partials/bootstrap/alert-heading.html b/layouts/partials/bootstrap/alert-heading.html index 909366c..b230d8b 100644 --- a/layouts/partials/bootstrap/alert-heading.html +++ b/layouts/partials/bootstrap/alert-heading.html @@ -1,4 +1,4 @@
- {{ partial "bootstrap/alert-icon" (cond .Parent.IsNamedParams (.Parent.Get "style") (.Parent.Get 0)) }} - {{ .Get 0 }} + {{- partial "bootstrap/alert-icon" (cond .Parent.IsNamedParams (.Parent.Get "style") (.Parent.Get 0)) -}} + {{- .Get 0 -}}
diff --git a/layouts/partials/bootstrap/alert.html b/layouts/partials/bootstrap/alert.html index af7c055..cbf7c72 100644 --- a/layouts/partials/bootstrap/alert.html +++ b/layouts/partials/bootstrap/alert.html @@ -9,5 +9,7 @@ {{- if not (findRE `alert-heading` .Inner) }} {{ partial "bootstrap/alert-icon" $style }} {{- end }} -
{{ .Inner }}
+
+ {{ .Inner }} +