diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 48cd825..c5a2cdb 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -19,6 +19,7 @@ @import "components/common/button"; @import "components/common/centering"; @import "components/common/columns"; +@import "components/common/details"; @import "components/common/headers"; @import "components/common/icon"; @import "components/common/padding"; diff --git a/assets/scss/components/common/details.scss b/assets/scss/components/common/details.scss new file mode 100644 index 0000000..24ad60a --- /dev/null +++ b/assets/scss/components/common/details.scss @@ -0,0 +1,29 @@ +/** + * Omegamma - Hugo theme for ad5001.eu and related websites. + * Copyright (C) 2021 Ad5001 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +details { + padding: 0; + margin-top: .4em; + margin-bottom: .4em; + + summary { + cursor: pointer; + font-size: x-large; + } +} + diff --git a/assets/scss/components/common/text.scss b/assets/scss/components/common/text.scss index beb5608..fa53483 100644 --- a/assets/scss/components/common/text.scss +++ b/assets/scss/components/common/text.scss @@ -33,7 +33,7 @@ color: white; } -p, .text-content, ul { +p, .text-content, ul, ol { line-height: 1.5em; } diff --git a/layouts/_default/default.html b/layouts/_default/default.html index 9fdb4df..6239efd 100644 --- a/layouts/_default/default.html +++ b/layouts/_default/default.html @@ -1,9 +1,12 @@ + {{- partial "head.html" . -}} {{- partial "header.html" . -}} -
{{ .Content }}
+
+ {{ .Content }} +
{{- partial "footer.html" . -}} diff --git a/layouts/shortcodes/badgeTable.html b/layouts/shortcodes/badgeTable.html index 62f0ffb..9a70dc6 100644 --- a/layouts/shortcodes/badgeTable.html +++ b/layouts/shortcodes/badgeTable.html @@ -1,19 +1,16 @@ +{{ $langs := slice "en" "fr" }} + +{{ $icon := .Get 0 }} +{{ $alt := .Get 1 }}
-
-

{{ i18n "en" }}

- {{ partial "badge.html" (dict "Icon" (.Get 0) "Lang" "en" "Alt" (.Get 1) ) }} + {{ range $langs }} +
+

{{ i18n . }}

+ {{ partial "badge.html" (dict "Icon" $icon "Lang" . "Alt" $alt ) }}
-
<img source="https://ad5001.eu/img/badges/en/{{ .Get 0 }}.svg" class="badge"/>
-
-
- -
-

{{ i18n "fr" }}

- {{ partial "badge.html" (dict "Icon" (.Get 0) "Lang" "fr" "Alt" (.Get 1) ) }} -
-
-
<img source="https://ad5001.eu/img/badges/fr/{{ .Get 0 }}.svg" class="badge"/>
+
<img source="https://ad5001.eu/img/badges/{{ . }}/{{ $icon }}.svg" class="badge"/>
+ {{ end }}
diff --git a/layouts/shortcodes/section1.html b/layouts/shortcodes/section1.html deleted file mode 100644 index 347d2a0..0000000 --- a/layouts/shortcodes/section1.html +++ /dev/null @@ -1,5 +0,0 @@ -
-


-{{ .Inner | markdownify }} -

-
diff --git a/layouts/shortcodes/summary.html b/layouts/shortcodes/summary.html new file mode 100644 index 0000000..b2cc59b --- /dev/null +++ b/layouts/shortcodes/summary.html @@ -0,0 +1,3 @@ + +{{ .Inner | markdownify }} +