From 6ee166e8e7ac3c0a5c4d45113ca59c75f84498d2 Mon Sep 17 00:00:00 2001 From: zzossig Date: Wed, 21 Oct 2020 05:25:30 +0900 Subject: [PATCH] notice shortcode redesign, subtitle support --- assets/sass/components/_notice.scss | 92 +++++++++++++++++++++-------- assets/sass/pages/_single.scss | 13 ++++ layouts/_default/single.html | 2 +- layouts/shortcodes/notice.html | 2 +- 4 files changed, 81 insertions(+), 28 deletions(-) diff --git a/assets/sass/components/_notice.scss b/assets/sass/components/_notice.scss index a4f8f34..ee8ef4b 100644 --- a/assets/sass/components/_notice.scss +++ b/assets/sass/components/_notice.scss @@ -2,7 +2,7 @@ position: relative; border-radius: .125rem; color: #fff; - margin: 2rem 0; + margin: 0 1rem; padding: .3rem 0.5rem .3rem 2rem; font-size: 0.95rem; @@ -18,17 +18,27 @@ } &.warning { - border-top: 30px solid #f1b37e; + border-top: 30px solid #ffd54f; background: #fefaf5; - color: rgba(150, 90, 38, 0.995) !important; + color: #161209; &::before { - position: absolute; - content: '⚠️ Warning'; - font-family: $title-font; - top: -26.5px; - left: 0.4rem; - height: 100%; + position: absolute; + content: url("data:image/svg+xml,%0A%3Csvg fill='%23000000' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='21px' height='21px'%3E%3Cpath fill='#f57f17' d='M 12 3.0292969 C 11.436813 3.0292969 10.873869 3.2917399 10.558594 3.8164062 L 1.7617188 18.451172 C 1.1134854 19.529186 1.94287 21 3.2011719 21 L 20.796875 21 C 22.054805 21 22.886515 19.529186 22.238281 18.451172 L 13.441406 3.8164062 C 13.126131 3.29174 12.563187 3.0292969 12 3.0292969 z M 12 5.2988281 L 20.236328 19 L 3.7636719 19 L 12 5.2988281 z M 11 9 L 11 14 L 13 14 L 13 9 L 11 9 z M 11 16 L 11 18 L 13 18 L 13 16 L 11 16 z'/%3E%3C/svg%3E"); + top: -26.5px; + left: 0.4rem; + height: 100%; + } + + &::after { + position: absolute; + content: attr(data-title); + font-family: $title-font; + font-weight: bold; + top: -26.5px; + left: 2rem; + height: 100%; + color: #424242; } a { @@ -66,15 +76,25 @@ &.error { border-top: 30px solid #d58181; background: #fbeded; - color: rgba(132, 56, 56, 0.995) !important; + color: #161209; &::before { - position: absolute; - content: '❌ Error'; - font-family: $title-font; - top: -26.5px; - left: 0.4rem; - height: 100%; + position: absolute; + content: url("data:image/svg+xml,%0A%3C%3Fxml version='1.0'%3F%3E%3Csvg fill='%23000000' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='21px' height='21px'%3E%3Cpath fill='#b71c1c' d='M 5 3 C 3.895 3 3 3.895 3 5 L 3 19 C 3 20.105 3.895 21 5 21 L 19 21 C 20.105 21 21 20.105 21 19 L 21 5 C 21 3.895 20.105 3 19 3 L 5 3 z M 5 5 L 19 5 L 19 19 L 5 19 L 5 5 z M 8.4101562 7 L 7 8.4101562 L 10.589844 12 L 7 15.589844 L 8.4101562 17 L 12 13.410156 L 15.589844 17 L 17 15.589844 L 13.410156 12 L 17 8.4101562 L 15.589844 7 L 12 10.589844 L 8.4101562 7 z'/%3E%3C/svg%3E"); + top: -26.5px; + left: 0.4rem; + height: 100%; + } + + &::after { + position: absolute; + content: attr(data-title); + font-family: $title-font; + font-weight: bold; + top: -26.5px; + left: 2rem; + height: 100%; + color: #424242; } a { @@ -112,17 +132,27 @@ &.info { border-top: 30px solid #6bb1e0; background: #e6f3fb; - color: rgba(47, 103, 141, 0.995) !important; + color: #161209; &::before { position: absolute; - content: 'ℹ️ Info'; - font-family: $title-font; + content: url("data:image/svg+xml,%3Csvg fill='%23000000' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='21px' height='21px'%3E%3Cpath fill='#01579b' d='M 12 2 C 6.4889971 2 2 6.4889971 2 12 C 2 17.511003 6.4889971 22 12 22 C 17.511003 22 22 17.511003 22 12 C 22 6.4889971 17.511003 2 12 2 z M 12 4 C 16.430123 4 20 7.5698774 20 12 C 20 16.430123 16.430123 20 12 20 C 7.5698774 20 4 16.430123 4 12 C 4 7.5698774 7.5698774 4 12 4 z M 11 7 L 11 9 L 13 9 L 13 7 L 11 7 z M 11 11 L 11 17 L 13 17 L 13 11 L 11 11 z'/%3E%3C/svg%3E"); top: -26.5px; left: 0.4rem; height: 100%; } + &::after { + position: absolute; + content: attr(data-title); + font-family: $title-font; + font-weight: bold; + top: -26.5px; + left: 2rem; + height: 100%; + color: #424242; + } + a { font-weight: bold; color: rgba(31, 87, 125, 0.995); @@ -158,15 +188,25 @@ &.success { border-top: 30px solid #84c578; background: #e8f7e6; - color: rgba(72, 125, 63, 0.995) !important; + color: #161209; &::before { - position: absolute; - content: '✔️ Success'; - font-family: $title-font; - top: -26.5px; - left: 0.4rem; - height: 100%; + position: absolute; + content: url("data:image/svg+xml,%0A%3Csvg fill='%23000000' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='21px' height='21px'%3E%3Cpath fill='#1b5e20' d='M 12 2 C 6.4889971 2 2 6.4889971 2 12 C 2 17.511003 6.4889971 22 12 22 C 17.511003 22 22 17.511003 22 12 C 22 6.4889971 17.511003 2 12 2 z M 12 4 C 16.430123 4 20 7.5698774 20 12 C 20 16.430123 16.430123 20 12 20 C 7.5698774 20 4 16.430123 4 12 C 4 7.5698774 7.5698774 4 12 4 z M 16.292969 8.2929688 L 10 14.585938 L 7.7070312 12.292969 L 6.2929688 13.707031 L 10 17.414062 L 17.707031 9.7070312 L 16.292969 8.2929688 z'/%3E%3C/svg%3E"); + top: -26.5px; + left: 0.4rem; + height: 100%; + } + + &::after { + position: absolute; + content: attr(data-title); + font-family: $title-font; + font-weight: bold; + top: -26.5px; + left: 2rem; + height: 100%; + color: #424242; } a { diff --git a/assets/sass/pages/_single.scss b/assets/sass/pages/_single.scss index 51b0419..8e8f7d8 100644 --- a/assets/sass/pages/_single.scss +++ b/assets/sass/pages/_single.scss @@ -22,6 +22,19 @@ } } + &__subtitle { + margin-bottom: 1.75rem; + font-family: $title-font; + + @include themify($themes) { + color: themed("toc-title-color"); + } + + &[data-ani="true"] { + @include animation('slide-in-down .2s .3s 1 ease-in both'); + } + } + &__shorttitle { font-size: 1.5rem; font-family: $title-font; diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 1987be3..e78683b 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -15,7 +15,7 @@
{{ i18n "nojs-message" }}

{{ .Title }}

-

{{ .Params.subtitle }}

+

{{ .Params.subtitle }}

{{ partial "body/infos" . }} {{ partial "body/tags" . }} diff --git a/layouts/shortcodes/notice.html b/layouts/shortcodes/notice.html index 8a581c7..65fad9b 100644 --- a/layouts/shortcodes/notice.html +++ b/layouts/shortcodes/notice.html @@ -1,3 +1,3 @@ -
+
{{ .Inner | markdownify }}
\ No newline at end of file