Preparing the details component, fixing bugs.

2 years ago · 8b1403e2d2
parent 6067077580
commit 8b1403e2d2
7 changed files with 48 additions and 20 deletions
--- 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";
--- a/assets/scss/components/common/details.scss
+++ 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 <https://www.gnu.org/licenses/>.
+ */
+
+details {
+    padding: 0;
+    margin-top: .4em;
+    margin-bottom: .4em;
+
+    summary {
+        cursor: pointer;
+        font-size: x-large;
+    }
+}
+
--- 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;
 }

--- a/layouts/_default/default.html
+++ b/layouts/_default/default.html
@ -1,9 +1,12 @@
 <!DOCTYPE html>
+
 <html lang="{{ .Site.Language.Lang }}">
    {{- partial "head.html" . -}}
    <body>
        {{- partial "header.html" . -}}
-        <div id="content">{{ .Content }}</div>
+        <div id="content">
+            {{ .Content }}
+        </div>
        {{- partial "footer.html" . -}}
    </body>
 </html>
--- a/layouts/shortcodes/badgeTable.html
+++ b/layouts/shortcodes/badgeTable.html
@ -1,19 +1,16 @@
+{{ $langs := slice "en" "fr" }}
+
+{{ $icon := .Get 0 }}
+{{ $alt := .Get 1 }}
 <div class="columns-container fill-width">
- <div class="col2 column text-center">
-  <h3>{{ i18n "en" }}</h3>
-  {{ partial "badge.html" (dict "Icon" (.Get 0) "Lang" "en" "Alt" (.Get 1) ) }}
+ {{ range $langs }}
+ <div class="col{{ len $langs }} column text-center">
+  <h3>{{ i18n . }}</h3>
+  {{ partial "badge.html" (dict "Icon" $icon "Lang" . "Alt" $alt ) }}
  <br>
  <div class="center fit-content">
-   <div class="code">&lt;img source="https://ad5001.eu/img/badges/en/{{ .Get 0 }}.svg" class="badge"/&gt;</div>
-  </div>
- </div>
- 
- <div class="col2 column text-center">
-  <h3>{{ i18n "fr" }}</h3>
-  {{ partial "badge.html" (dict "Icon" (.Get 0) "Lang" "fr" "Alt" (.Get 1) ) }}
-  <br>
-  <div class="center fit-content">
-   <div class="code">&lt;img source="https://ad5001.eu/img/badges/fr/{{ .Get 0 }}.svg" class="badge"/&gt;</div>
+   <div class="code">&lt;img source="https://ad5001.eu/img/badges/{{ . }}/{{ $icon }}.svg" class="badge"/&gt;</div>
  </div>
 </div>
+ {{ end }}
 </div>
--- a/layouts/shortcodes/section1.html
+++ b/layouts/shortcodes/section1.html
@ -1,5 +0,0 @@
-<section style="background-image: url({{ .Get 0 }});" class="section1">
-<br><br><br>
-{{ .Inner | markdownify }}
-<br><br>
-</section>
--- a/layouts/shortcodes/summary.html
+++ b/layouts/shortcodes/summary.html
@ -0,0 +1,3 @@
+<summary>
+{{ .Inner | markdownify }}
+</summary>