From 8ed8c4c182e01564b9ca6c9e84055d2e91b71abe Mon Sep 17 00:00:00 2001
From: Marco Molinaro <marco.molinaro@inaf.it>
Date: Mon, 30 Sep 2024 16:18:52 +0200
Subject: [PATCH 1/3] md translated about/contacts page

---
 content/about/contacts.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 content/about/contacts.md

diff --git a/content/about/contacts.md b/content/about/contacts.md
new file mode 100644
index 0000000..47a8ffd
--- /dev/null
+++ b/content/about/contacts.md
@@ -0,0 +1,22 @@
+---
+title: "Contacts"
+date: 2024-09-30T15:00:00+02:00
+draft: false
+tags:
+- about
+---
+
+_IVOA Executive Committee_
+- **IVOA Chair**: [Simon O'Toole](mailto:simon.otoole@mq.edu.au)
+- **Deputy Chair**: [JJ Kavelaars](mailto:jj.kavelaars@nrc-cnrc.gc.ca)
+- *Secretary*: [Marcy Harbut](mailto:mharbut@ipac.caltech.edu)
+
+Contacts for the [_IVOA Member Organizations_](../member-contacts)
+
+_IVOA Technical Coordination Group (TCG)_
+- **TCG Chair**: [Marco Molinaro](mailto:marco.molinaro@inaf.it)
+- **TCG Deputy**: [Tom Donaldson](mailto:tdonaldson@stsci.edu)
+ 
+Contacts for the [_IVOA Working Groups_](../../members/working-groups)
+
+_IVOA Document Coordinator_: [Giulia Iafrate](mailto:ivoadoc@ivoa.net)

From 0f09a5f4a3176037dd18e164d281c5d97d109319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Mantelet?=
 <gregory.mantelet@astro.unistra.fr>
Date: Mon, 30 Sep 2024 10:05:12 +0200
Subject: [PATCH 2/3] Add a shortcode for floating (left or right) content

---
 layouts/shortcodes/floating.html |  3 +++
 static/css/ivoa.css              | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 layouts/shortcodes/floating.html

diff --git a/layouts/shortcodes/floating.html b/layouts/shortcodes/floating.html
new file mode 100644
index 0000000..0ebeb9c
--- /dev/null
+++ b/layouts/shortcodes/floating.html
@@ -0,0 +1,3 @@
+<div class="{{ if .Get 0 }}floating {{ .Get 0 }}{{ else }}floating{{ end }}">
+    {{ .Inner | markdownify }}
+</div>
\ No newline at end of file
diff --git a/static/css/ivoa.css b/static/css/ivoa.css
index bd35b77..caaebf8 100644
--- a/static/css/ivoa.css
+++ b/static/css/ivoa.css
@@ -21,6 +21,7 @@ body {
 
 h1, h2, h3 {
     color: #012647;
+    clear: both;
 }
 
 body > main > article > header > h1 {
@@ -404,4 +405,20 @@ section > main.carrousel {
 .sitemap .card { border: none }
 .sitemap .card:nth-child(1) > .card-title { border-bottom-color: #5dbbf5 }
 .sitemap .card:nth-child(2) > .card-title { border-bottom-color: #399110 }
-.sitemap .card:nth-child(3) > .card-title { border-bottom-color: #aa3f3f }
\ No newline at end of file
+.sitemap .card:nth-child(3) > .card-title { border-bottom-color: #aa3f3f }
+
+
+/* =============================================================================
+   FLOATING
+ */
+
+.floating {
+    margin: 1em;
+    margin-top: 0;
+}
+.floating.left  { float: left ; margin-left: 0; }
+.floating.right { float: right; margin-right: 0; }
+
+.floating > img {
+    max-width: 30vw;
+}

From 73807127465bd94a84288c17e99f146ee39dd65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Mantelet?=
 <gregory.mantelet@astro.unistra.fr>
Date: Mon, 30 Sep 2024 10:07:46 +0200
Subject: [PATCH 3/3] Add a shortcode for paragraph with a side image (left or
 right).

This shortcode is a bit different from the `floating` shortcode. The content
is not floating around the image, but is rather visually put on a separate
column.
---
 layouts/shortcodes/side-image.html | 12 ++++++++++++
 static/css/ivoa.css                | 25 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 layouts/shortcodes/side-image.html

diff --git a/layouts/shortcodes/side-image.html b/layouts/shortcodes/side-image.html
new file mode 100644
index 0000000..5f5cab2
--- /dev/null
+++ b/layouts/shortcodes/side-image.html
@@ -0,0 +1,12 @@
+<section class="with-image {{ .Get "position" }}">
+    <aside>
+    {{- if (.Get "thumbnail") }}
+        <a href="{{ .Get "image" }}"><img src="{{- .Get "thumbnail" }}" /></a>
+    {{- else }}
+        <img src="{{- .Get "image" }}" />
+    {{- end }}
+    </aside>
+    <main>
+        {{- .Inner | markdownify }}
+    </main>
+</section>
\ No newline at end of file
diff --git a/static/css/ivoa.css b/static/css/ivoa.css
index caaebf8..dd7f662 100644
--- a/static/css/ivoa.css
+++ b/static/css/ivoa.css
@@ -245,6 +245,31 @@ section > main + aside  { margin-left: 1em }
 }
 
 
+/* =============================================================================
+   SECTION WITH A SIDE IMAGE
+ */
+
+.with-image {
+    display              : grid;
+    grid-template-columns: auto 1fr;
+    grid-template-areas  : "image content";
+    column-gap: 1em;
+}
+
+.with-image.right {
+    grid-template-columns: 1fr auto;
+    grid-template-areas  : "content image";
+}
+
+.with-image > aside {
+    grid-area : image;
+    margin-top: 1em;
+}
+
+.with-image > aside > img { max-width: 30vw }
+.with-image > main        { grid-area: content }
+
+
 /* =============================================================================
    CARROUSEL
  */