From 157e78a84bbd8b91deccf3a5d1020d31180df9c2 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 14 Dec 2016 15:41:55 +0100 Subject: [PATCH] web: updated blog navigation, fixed jquery conflict --- web/blog/_includes/head.html | 1 - web/blog/_includes/navigation-bottom.html | 96 ++++++++------ web/blog/_includes/navigation-top.html | 145 +++++++++++----------- web/blog/_includes/scripts.html | 13 ++ web/blog/_sass/_navigation.scss | 7 +- web/blog/assets/js/navigation.js | 45 +------ web/blog/navigation-font.css | 120 ------------------ 7 files changed, 154 insertions(+), 273 deletions(-) delete mode 100644 web/blog/navigation-font.css diff --git a/web/blog/_includes/head.html b/web/blog/_includes/head.html index 832c759f..d22a44a2 100644 --- a/web/blog/_includes/head.html +++ b/web/blog/_includes/head.html @@ -94,4 +94,3 @@ {% endif %} {% endif %} - diff --git a/web/blog/_includes/navigation-bottom.html b/web/blog/_includes/navigation-bottom.html index ae1e2e16..69a1bf45 100644 --- a/web/blog/_includes/navigation-bottom.html +++ b/web/blog/_includes/navigation-bottom.html @@ -1,48 +1,66 @@