From 8f4ee8f7763c9642a16fa72f1303cec7fc21f8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o?= <theo@le-filament.com> Date: Thu, 21 Oct 2021 13:11:03 +0200 Subject: [PATCH] table style and utf-8 --- config.toml | 3 ++ .../le_filament/layouts/_default/single.html | 28 +----------- .../le_filament/layouts/partials/footer.html | 8 ++-- themes/le_filament/layouts/partials/head.html | 1 + themes/le_filament/layouts/posts/single.html | 8 ++++ themes/le_filament/static/css/style.css | 43 ++++++++++++++++--- 6 files changed, 55 insertions(+), 36 deletions(-) diff --git a/config.toml b/config.toml index 71a9bf5..1ab452e 100644 --- a/config.toml +++ b/config.toml @@ -11,3 +11,6 @@ theme = "le_filament" [[menu.main]] name = "Étiquettes" url = "/tags" + +[markup] + defaultMarkdownHandler = "pandoc" diff --git a/themes/le_filament/layouts/_default/single.html b/themes/le_filament/layouts/_default/single.html index 6eed777..978c824 100644 --- a/themes/le_filament/layouts/_default/single.html +++ b/themes/le_filament/layouts/_default/single.html @@ -1,30 +1,6 @@ {{ define "main" }} <main id="main"> - <article> - <h1>{{ .Title }}</h1> - {{ .Content }} - </article> - <section class="post-taxonomy"> - <h3>Étiquettes</h3> - <div> - {{ range (.GetTerms "tags") }} - <a href="{{ .Permalink }}" class="taxonomy">{{ .LinkTitle }}</a> - {{ end }} - </div> - <h3>Catégories</h3> - <div> - {{ range (.GetTerms "categories") }} - <a href="{{ .Permalink }}" class="taxonomy">{{ .LinkTitle }}</a> - {{ end }} - </div> - </section> - {{ if (isset .Params "mastodon_id") }} - <section id="comments"> - <h2>Commentaires</h2> - <a type=button id="load_comments" class="mastodon_button" onclick="loadComments({{ .Params.mastodon_id }})">Afficher les commentaires</a> - <div id="comments_holder"></div> - <a type=button class="mastodon_button" href="https://mastodon.social/interact/{{ .Params.mastodon_id }}?type=reply">Écrire un commentaire</a> - </section> - {{ end }} + <h1>{{ .Title }}</h1> + {{ .Content }} </main> {{ end }} diff --git a/themes/le_filament/layouts/partials/footer.html b/themes/le_filament/layouts/partials/footer.html index e46a960..741b62e 100644 --- a/themes/le_filament/layouts/partials/footer.html +++ b/themes/le_filament/layouts/partials/footer.html @@ -3,15 +3,15 @@ © <a href="https://le-filament.com">Le Filament</a> - <a href="https://le-filament.com/mentions-legales">Mentions Légales</a> - <a href="https://le-filament.com/services-libres">Services Libres</a> </p> <a href="https://sources.le-filament.com/lefilament" target="_blank" title="Le Filament - GitLab"> - <img src="https://le-filament.com/img/logo-gitlab.svg" alt="Le Filament - GitLab" > + <img src="https://le-filament.com/img/logo-gitlab.svg" alt="Le Filament - GitLab" class="logo"> </a> <a href="https://github.com/lefilament" target="_blank" title="Le Filament - GitHub"> - <img src="https://le-filament.com/img/logo-github.svg" alt="Le Filament - GitHub" > + <img src="https://le-filament.com/img/logo-github.svg" alt="Le Filament - GitHub" class="logo"> </a> <a href="https://hub.docker.com/search/?q=lefilament%2F&type=image" target="_blank" title="Le Filament - DockerHub"> - <img src="https://le-filament.com/img/logo-docker.svg" alt="Le Filament - DockerHub" > + <img src="https://le-filament.com/img/logo-docker.svg" alt="Le Filament - DockerHub" class="logo"> </a> <a rel="me" href="https://pouet.chapril.org/@le_filament" target="_blank" title="Le Filament - Mastodon"> - <img src="/images/logo-mastodon.svg" alt="Le Filament - Mastodon" > + <img src="/images/logo-mastodon.svg" alt="Le Filament - Mastodon" class="logo"> </a> </footer> diff --git a/themes/le_filament/layouts/partials/head.html b/themes/le_filament/layouts/partials/head.html index e4de956..4686396 100644 --- a/themes/le_filament/layouts/partials/head.html +++ b/themes/le_filament/layouts/partials/head.html @@ -1,5 +1,6 @@ <title>Le Filament - {{ .Title }}</title> +<meta charset="utf-8"/> <meta name="description" content="Le Filament est une SCOP toulousaine spécialisée dans la conduite de projets informatiques et l'intégration d'outils CRM ERP"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="keywords" content="le filament, toulouse, numerique, odoo, mail, systeme, alfresco, bluemind, nextcloud, open source, logiciel libre, données, rgpd" /> diff --git a/themes/le_filament/layouts/posts/single.html b/themes/le_filament/layouts/posts/single.html index 6eed777..6ae03ca 100644 --- a/themes/le_filament/layouts/posts/single.html +++ b/themes/le_filament/layouts/posts/single.html @@ -5,18 +5,26 @@ {{ .Content }} </article> <section class="post-taxonomy"> + <h3>Licence</h3> + <div> + <a href="{{ .Params.licence.url | default "https://creativecommons.org/licenses/by-sa/4.0/" }}" class="taxonomy">{{ .Params.licence.name | default "CC-BY-SA" }}</a> + </div> + {{ if (isset .Params "tags") }} <h3>Étiquettes</h3> <div> {{ range (.GetTerms "tags") }} <a href="{{ .Permalink }}" class="taxonomy">{{ .LinkTitle }}</a> {{ end }} </div> + {{ end }} + {{ if (isset .Params "categories") }} <h3>Catégories</h3> <div> {{ range (.GetTerms "categories") }} <a href="{{ .Permalink }}" class="taxonomy">{{ .LinkTitle }}</a> {{ end }} </div> + {{ end }} </section> {{ if (isset .Params "mastodon_id") }} <section id="comments"> diff --git a/themes/le_filament/static/css/style.css b/themes/le_filament/static/css/style.css index aa6a295..0356803 100644 --- a/themes/le_filament/static/css/style.css +++ b/themes/le_filament/static/css/style.css @@ -42,8 +42,10 @@ p { } img { + display: block; height: auto; max-width: 100%; + margin: 0 auto; } nav { @@ -59,10 +61,43 @@ nav .logo { margin-top: 10px; } +main { + width: 750px; + margin: 50px auto; +} + section { margin: 100px 0; } +table { + margin: 0 auto; + border-collapse: collapse; +} + +table thead { + border-bottom: solid 2px; +} + +table th, +table td { + border-left: solid 1px; +} + +table tr th:first-child, +table tr td:first-child { + border-left: none; +} + +table tr { + border-bottom: thin; +} + +table th, +table td { + padding: 5px 10px; +} + .menu { display: flex; justify-content: space-between; @@ -92,11 +127,6 @@ section { padding-top: 8px; } -main { - width: 750px; - margin: 50px auto; -} - .post { margin: 50px 0; } @@ -162,7 +192,8 @@ footer { font-size: 12px; } -footer img { +footer .logo { + display: inline-block; height: 20px; margin: 10px; } -- GitLab