From 5489902885da1c4c3984cf8243deb1ca0420c3ea Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 20 May 2016 19:44:48 +0100 Subject: [PATCH] Use different navbar on index and all other pages --- content/pages/homepage.html | 27 ++---------------- theme/static/src/js/creative/creative.js | 2 +- theme/templates/base.html | 24 ++++++++++++++++ theme/templates/page-home.html | 35 ++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 26 deletions(-) create mode 100644 theme/templates/page-home.html diff --git a/content/pages/homepage.html b/content/pages/homepage.html index 7ce8497..85ee920 100644 --- a/content/pages/homepage.html +++ b/content/pages/homepage.html @@ -2,33 +2,10 @@ + - - -
+

Welcome to my website

diff --git a/theme/static/src/js/creative/creative.js b/theme/static/src/js/creative/creative.js index 91b9851..7d5f4a8 100644 --- a/theme/static/src/js/creative/creative.js +++ b/theme/static/src/js/creative/creative.js @@ -36,7 +36,7 @@ ); // Offset for Main Navigation - $('#indexNav').affix({ + $('#main-nav').affix({ offset: { top: 100 } diff --git a/theme/templates/base.html b/theme/templates/base.html index 6190927..0c66657 100644 --- a/theme/templates/base.html +++ b/theme/templates/base.html @@ -12,6 +12,30 @@ + {% block navbar %} + + {% endblock %} {% block content %}{% endblock %} diff --git a/theme/templates/page-home.html b/theme/templates/page-home.html new file mode 100644 index 0000000..8bb51bd --- /dev/null +++ b/theme/templates/page-home.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} + +{% block htmltitle %} + {{ page.title }} +{% endblock %} + +{% block content %} + {{ page.content }} +{% endblock %} + +{% block navbar %} + +{% endblock %}