From 0d3100ba33923ba986e5d0b2962cd5ec7535f711 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Thu, 28 Dec 2023 00:12:51 -0800 Subject: [PATCH] Make exercises into details (so they can be collapsed) --- assets/scss/bergamot.scss | 4 +-- layouts/shortcodes/bergamot_exercise.html | 31 +++++++++++++---------- layouts/shortcodes/bergamot_preset.html | 1 + 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/assets/scss/bergamot.scss b/assets/scss/bergamot.scss index 826b1f0..f10a9f0 100644 --- a/assets/scss/bergamot.scss +++ b/assets/scss/bergamot.scss @@ -2,8 +2,6 @@ @import "mixins.scss"; .bergamot-exercise { - @include bordered-block; - padding: 1em; counter-increment: bergamot-exercise; .bergamot-root { @@ -69,7 +67,7 @@ } .bergamot-button-group { - margin-top: 0.5em; + margin-top: 1em; } } diff --git a/layouts/shortcodes/bergamot_exercise.html b/layouts/shortcodes/bergamot_exercise.html index 67244d2..817c3ba 100644 --- a/layouts/shortcodes/bergamot_exercise.html +++ b/layouts/shortcodes/bergamot_exercise.html @@ -1,18 +1,21 @@
- - {{ partial "icon.html" "edit-2" }} - - {{ if or (eq (.Get "label") "") (eq (.Get "label") nil) }}{{ else }}({{ .Get "label" }}){{ end }}: - - {{ .Inner }} +
+ + + + {{ if or (eq (.Get "label") "") (eq (.Get "label") nil) }}{{ else }}({{ .Get "label" }}){{ end }}: + + + {{ .Inner }} -
- {{ if or (eq (.Get "preset") "") (eq (.Get "preset") nil) }} - {{ else }} - - - {{ end }} -
+
+ {{ if or (eq (.Get "preset") "") (eq (.Get "preset") nil) }} + {{ else }} + + + {{ end }} +
-
+
+
diff --git a/layouts/shortcodes/bergamot_preset.html b/layouts/shortcodes/bergamot_preset.html index 8da76ee..377e97b 100644 --- a/layouts/shortcodes/bergamot_preset.html +++ b/layouts/shortcodes/bergamot_preset.html @@ -2,5 +2,6 @@ window.Bergamot.presets['{{ .Get "name" }}'] = { rules: '{{ .Inner }}', inputPrompt: '{{ .Get "prompt" }}', + query: '{{ .Get "query" }}', };