From c9d2849419a73da351c7db542a013ee21001fb4b Mon Sep 17 00:00:00 2001 From: pikselkraft Date: Tue, 16 Jun 2020 12:14:24 +0200 Subject: [PATCH 1/5] =?UTF-8?q?changement=20structure=20annuaires=20avec?= =?UTF-8?q?=20un=20th=C3=A8me=20particulier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/styles/content.sass | 19 +++++++++++++++++-- content/{ => annuaires}/annuaires.md | 0 content/manifesto.md | 4 +--- layouts/annuaires/annuaires.html | 16 ++++++++++++++++ 4 files changed, 34 insertions(+), 5 deletions(-) rename content/{ => annuaires}/annuaires.md (100%) create mode 100644 layouts/annuaires/annuaires.html diff --git a/assets/styles/content.sass b/assets/styles/content.sass index 8c7dd9a..ef0ad70 100644 --- a/assets/styles/content.sass +++ b/assets/styles/content.sass @@ -1,4 +1,19 @@ .container - padding: 1rem + //padding: 1rem + margin: 0 auto + width: 90% + main - padding-bottom: 2*$space \ No newline at end of file + padding-bottom: 2*$space + +@media screen and (min-width: 60em) + .container + width: 85% + +/*************/ +/* ANNUAIRES */ +/*************/ + +@media screen and (min-width: 60em) + .annuaires + columns: 3 diff --git a/content/annuaires.md b/content/annuaires/annuaires.md similarity index 100% rename from content/annuaires.md rename to content/annuaires/annuaires.md diff --git a/content/manifesto.md b/content/manifesto.md index 360b8bb..586d4b8 100644 --- a/content/manifesto.md +++ b/content/manifesto.md @@ -6,9 +6,7 @@ menu: weight: 10 --- -# Intro site - -A-faire +## Notre manifesto ----- diff --git a/layouts/annuaires/annuaires.html b/layouts/annuaires/annuaires.html new file mode 100644 index 0000000..de1329c --- /dev/null +++ b/layouts/annuaires/annuaires.html @@ -0,0 +1,16 @@ + + +{{ partial "head.html" . }} + + {{ partial "header.html" . }} +
+ {{ define "main" }} +
+ {{ .Content }} +
+ {{ end }} +
+ {{ partial "footer.html" . }} + {{ partial "js.html" . }} + + From d61e810cd512cf4fd0163171228b81c6bd2f7c05 Mon Sep 17 00:00:00 2001 From: pikselkraft Date: Tue, 16 Jun 2020 12:38:50 +0200 Subject: [PATCH 2/5] changement structure annuaires > reglage pb content --- content/annuaires/{annuaires.md => _index.md} | 0 layouts/annuaires/annuaires.html | 22 +++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) rename content/annuaires/{annuaires.md => _index.md} (100%) diff --git a/content/annuaires/annuaires.md b/content/annuaires/_index.md similarity index 100% rename from content/annuaires/annuaires.md rename to content/annuaires/_index.md diff --git a/layouts/annuaires/annuaires.html b/layouts/annuaires/annuaires.html index de1329c..71ea260 100644 --- a/layouts/annuaires/annuaires.html +++ b/layouts/annuaires/annuaires.html @@ -1,16 +1,6 @@ - - -{{ partial "head.html" . }} - - {{ partial "header.html" . }} -
- {{ define "main" }} -
- {{ .Content }} -
- {{ end }} -
- {{ partial "footer.html" . }} - {{ partial "js.html" . }} - - +{{ define "main" }} + {{ .Title }} +
+ {{ .Content }} +
+{{ end }} From 63e2c7d13a5aa6b73938229201703198d827178e Mon Sep 17 00:00:00 2001 From: pikselkraft Date: Wed, 24 Jun 2020 12:07:39 +0200 Subject: [PATCH 3/5] ajout shortcode pour page ressources + css --- assets/styles/content.sass | 14 +++ content/annuaires/_index.md | 5 +- content/outils-ressources.md | 184 ++++++++++++++++++------------- layouts/annuaires/annuaires.html | 2 +- layouts/shortcodes/col-list.html | 3 + layouts/shortcodes/row-list.html | 3 + 6 files changed, 132 insertions(+), 79 deletions(-) create mode 100644 layouts/shortcodes/col-list.html create mode 100644 layouts/shortcodes/row-list.html diff --git a/assets/styles/content.sass b/assets/styles/content.sass index ef0ad70..efb8c5b 100644 --- a/assets/styles/content.sass +++ b/assets/styles/content.sass @@ -17,3 +17,17 @@ main @media screen and (min-width: 60em) .annuaires columns: 3 + + +@media screen and (min-width: 60em) + .row-list + display: flex + flex-wrap: wrap + .col-list + width: 45% + min-height: 12rem + margin: 0.5rem + padding: 1rem + border: 1px solid + .col-list h3 + margin: 1rem 0 diff --git a/content/annuaires/_index.md b/content/annuaires/_index.md index 9bb17d3..4a342a9 100644 --- a/content/annuaires/_index.md +++ b/content/annuaires/_index.md @@ -1,12 +1,11 @@ --- -title: Annuaires des acteurs +title: Annuaires des low-tech menu: main: - name: 📔 Annuaires + name: 📔 Annuaires des low-tech weight: 20 --- -## Acteurs des low-tech : * [Le Low Tech Lab](https://lowtechlab.org/) * [Le Low Tech Magazine](https://solar.lowtechmagazine.com/) * [Gauthier Roussilhe](http://gauthierroussilhe.com) diff --git a/content/outils-ressources.md b/content/outils-ressources.md index 18d3d2e..5972d43 100644 --- a/content/outils-ressources.md +++ b/content/outils-ressources.md @@ -6,91 +6,125 @@ menu: weight: 30 --- -## Ressources +## Ressources pour un web low-tech +{{< row-list >}} +{{< col-list >}} +

Écoconception

+ +{{< /col-list >}} -### Lectures +{{< col-list >}} +

Rapport

+ +{{< /col-list >}} -#### Écoconception +{{< col-list >}} +

Low Tech

+
    +
  • Phillipe Bihouix, L'âge des Low Tech : Vers une civilisation techniquement soutenable
    • +
+{{< /col-list >}} -* [Guide de conversion numérique au low tech](http://gauthierroussilhe.com/fr/posts/convert-low-tech) -* [James Christie, Sustainable Web Design](https://alistapart.com/article/sustainable-web-design/) -* Écoconception web : les 115 bonnes pratiques – 3ème édition +{{< col-list >}} +

Design

+ +{{< /col-list >}} -#### Rapport +{{< col-list >}} +

Accessibilité

+
    +
  • Laura Kalbag, Accessibility for Everyone/li> +
+{{< /col-list >}} -* [The shift project](https://theshiftproject.org/lean-ict/) +{{< col-list >}} +

Société

+ +{{< /col-list >}} +{{< /row-list >}} -#### Low Tech +## Outils pour un web low-tech +{{< row-list >}} +{{< col-list >}} +

Mesures

+ +{{< /col-list >}} -* Phillipe Bihouix, L'âge des Low Tech : Vers une civilisation techniquement soutenable +{{< col-list >}} +

Usage alternatif

+ +{{< /col-list >}} -#### Design +{{< col-list >}} +

Développement

+ -* Eric Meyer & Sara Wachter-Boettcher, Design for Real Life -* Erika Hall, Just Enough Research +{{< /col-list >}} -#### Accessibilité +{{< col-list >}} +

Design

+ +{{< /col-list >}} -* Laura Kalbag, Accessibility for Everyone +{{< col-list >}} +

Auto-hébergement

+ +{{< /col-list >}} -#### Société +{{< col-list >}} +

Hébergement

+ +{{< /col-list >}} -* [Éloi Laurent, Et si nous nous trompions de transition ? Pour un luddisme écologique](http://lapenseeecologique.com/et-si-nous-nous-trompions-de-transition-pour-un-luddisme-ecologique/) - -### Conférences & Podcasts - -* Design et consommation - * [Groupe d'éducation en design](https://groupe.design/) - * [Repenser le numérique dans les limites planétaires - BlendWebMix - Gauthier Roussilhe](https://www.youtube.com/watch?v=pvl6QeeBOaU&feature=emb_title) -* Vie privée - * [The Future of Internet Regulation at the European Parliament](https://ar.al/2019/11/29/the-future-of-internet-regulation-at-the-european-parliament/) - * [Laura Kalbag / ffconf 2019](https://www.youtube.com/watch?v=WkeGGNdOv4g&feature=youtu.be) | [lien invidio.us](https://invidio.us/watch?v=WkeGGNdOv4g) - -## Outils - -### Mesures - -* [Website Carbon Calculator](https://www.websitecarbon.com/) -* [Ecoindex](http://www.ecoindex.fr/) -* [Website Carbon](https://www.websitecarbon.com/) -* [GTmetrix](https://gtmetrix.com) - -### Usage alternatif - -* [nightnight](https://www.nightnight.みんな/details) -* [Kiwix](https://www.kiwix.org/) -* [El paquete](https://fr.wikipedia.org/wiki/El_paquete_hebdomadaire) -* [DakNet](https://ieeexplore.ieee.org/document/1319279) - -### Développement - -#### Générateurs statique - -* [Hugo](https://gohugo.io/) -* [Jekyll](https://jekyllrb.com/) -* [Kirby](https://getkirby.com/) -* [Getpublii](https://getpublii.com/) -* [Mavo.io](https://mavo.io/) -* [11ty](https://www.11ty.dev/) - -### Design - -* [Small Technology](https://small-tech.org/) -* [Disrupt Design](https://www.disruptdesign.co/) - -### Auto-hébergement - -* [RaspberryPi](https://www.raspberrypi.org/) -* [NextCloud](https://nextcloud.com/) -* [Fediverse](https://fediverse.party/) - -### Hébergement - -* [Commons host](https://commons.host/) -* [Greenhost](https://greenhost.net/) -* [Ikoula](https://www.ikoula.com/fr) -* [Site.js](https://sitejs.org/) - -### Editeur - -* [Marktext](https://github.com/marktext/marktext) +{{< col-list >}} +

Editeur

+ +{{< /col-list >}} +{{< /row-list >}} diff --git a/layouts/annuaires/annuaires.html b/layouts/annuaires/annuaires.html index 71ea260..1cbd77e 100644 --- a/layouts/annuaires/annuaires.html +++ b/layouts/annuaires/annuaires.html @@ -1,5 +1,5 @@ {{ define "main" }} - {{ .Title }} +

{{ .Title }}

{{ .Content }}
diff --git a/layouts/shortcodes/col-list.html b/layouts/shortcodes/col-list.html new file mode 100644 index 0000000..6f5028c --- /dev/null +++ b/layouts/shortcodes/col-list.html @@ -0,0 +1,3 @@ +
+{{.Inner}} +
diff --git a/layouts/shortcodes/row-list.html b/layouts/shortcodes/row-list.html new file mode 100644 index 0000000..af18abe --- /dev/null +++ b/layouts/shortcodes/row-list.html @@ -0,0 +1,3 @@ +
+{{.Inner}} +
From 2b17c1d2db7249c92eec6dd1a010008e125f9f63 Mon Sep 17 00:00:00 2001 From: Simon C Date: Tue, 21 Jul 2020 10:54:24 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Suppression=20d'une=20classe=20non=20utilis?= =?UTF-8?q?=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/styles/content.sass | 9 --------- 1 file changed, 9 deletions(-) diff --git a/assets/styles/content.sass b/assets/styles/content.sass index efb8c5b..a72825a 100644 --- a/assets/styles/content.sass +++ b/assets/styles/content.sass @@ -1,15 +1,6 @@ -.container - //padding: 1rem - margin: 0 auto - width: 90% - main padding-bottom: 2*$space -@media screen and (min-width: 60em) - .container - width: 85% - /*************/ /* ANNUAIRES */ /*************/ From a79381f33b7dc17471005b20f4970d4411e7b9c8 Mon Sep 17 00:00:00 2001 From: Simon C Date: Tue, 21 Jul 2020 10:54:40 +0200 Subject: [PATCH 5/5] fix le titre du menu --- content/annuaires/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/annuaires/_index.md b/content/annuaires/_index.md index 4a342a9..63f1271 100644 --- a/content/annuaires/_index.md +++ b/content/annuaires/_index.md @@ -2,7 +2,7 @@ title: Annuaires des low-tech menu: main: - name: 📔 Annuaires des low-tech + name: 📔 Annuaires weight: 20 ---