From 040b0e6fe74f6d4c5c2e24561c92df78daf70882 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 19 Oct 2020 18:02:34 +0200 Subject: [PATCH] First try redesign structure --- _data/de/{wiki => }/navigation.yml | 0 _data/en/{wiki => }/navigation.yml | 0 _data/es/{wiki => }/navigation.yml | 0 _includes/README.md | 2 +- _includes/{wiki => general}/nav.html | 8 +-- _includes/general/navbtn.html | 10 +++ _includes/headtags.html | 1 + _layouts/mainhomepage.html | 13 ++-- _layouts/wiki.html | 16 +---- assets/css/fw.css | 97 +++++++++++++++++++++++++++- assets/css/noscript.css | 2 +- assets/css/wiki.css | 95 --------------------------- assets/js/nav.js | 2 +- browserconfig.xml | 8 ++- de-index.html | 9 ++- index.html | 8 +-- 16 files changed, 137 insertions(+), 134 deletions(-) rename _data/de/{wiki => }/navigation.yml (100%) rename _data/en/{wiki => }/navigation.yml (100%) rename _data/es/{wiki => }/navigation.yml (100%) rename _includes/{wiki => general}/nav.html (90%) create mode 100644 _includes/general/navbtn.html diff --git a/_data/de/wiki/navigation.yml b/_data/de/navigation.yml similarity index 100% rename from _data/de/wiki/navigation.yml rename to _data/de/navigation.yml diff --git a/_data/en/wiki/navigation.yml b/_data/en/navigation.yml similarity index 100% rename from _data/en/wiki/navigation.yml rename to _data/en/navigation.yml diff --git a/_data/es/wiki/navigation.yml b/_data/es/navigation.yml similarity index 100% rename from _data/es/wiki/navigation.yml rename to _data/es/navigation.yml diff --git a/_includes/README.md b/_includes/README.md index ddf94f9..217e0a4 100644 --- a/_includes/README.md +++ b/_includes/README.md @@ -3,7 +3,7 @@ Holds fragments/files which are included in other sites. general/languagecode folder: includes translated fragments which are included in every site. wiki/languagecode folder: includes translated fragments which are included in the wiki. -wiki/nav.html file: template for the navigation in the wiki. +general/nav.html file: template for the navigation in the wiki. footer.html file: general template for the footer. headtags.html file: holds tags which are included in every sites' . This file can not be translated. langselect.html file: holds template to generate a language picker. diff --git a/_includes/wiki/nav.html b/_includes/general/nav.html similarity index 90% rename from _includes/wiki/nav.html rename to _includes/general/nav.html index c50ed96..1aef4d6 100644 --- a/_includes/wiki/nav.html +++ b/_includes/general/nav.html @@ -1,9 +1,9 @@ -