From 421677613114bb40780d3a5516b6930d386d0b09 Mon Sep 17 00:00:00 2001 From: Mitja Felicijan Date: Mon, 21 Oct 2019 06:49:39 +0200 Subject: Added comments and updated CV --- source/layouts/comments.njk | 2 + source/layouts/draft.njk | 77 ++++++++++++++-------------- source/layouts/footer.njk | 42 ++++++++++------ source/layouts/index.njk | 114 +++++++++++++++++++++--------------------- source/layouts/navigation.njk | 24 ++++++--- source/layouts/page.njk | 72 +++++++++++++------------- source/layouts/post.njk | 81 ++++++++++++++++-------------- 7 files changed, 221 insertions(+), 191 deletions(-) create mode 100644 source/layouts/comments.njk (limited to 'source/layouts') diff --git a/source/layouts/comments.njk b/source/layouts/comments.njk new file mode 100644 index 0000000..7ee4af8 --- /dev/null +++ b/source/layouts/comments.njk @@ -0,0 +1,2 @@ +
+ diff --git a/source/layouts/draft.njk b/source/layouts/draft.njk index 72923c9..0f2091c 100644 --- a/source/layouts/draft.njk +++ b/source/layouts/draft.njk @@ -1,61 +1,62 @@ - - - - - + + + + + - + - + - {{ title }} - - + {{ title }} + + - - - - - + + + + + - - - - - + + + + + - {{ css }} + {{ css }} - + - + -
+
- {% include "navigation.njk" %} + {% include "navigation.njk" %} -
+
-
-

{{ title }}

-

Published on - - by {{ vars.author }}

-
+
+

{{ title }}

+

Published on + + by + {{ vars.author }}

+
- {{ content|safe }} + {{ content|safe }} -
+
- {{ javascript }} + {{ javascript }} - {% include "footer.njk" %} + {% include "footer.njk" %} -
+
- + diff --git a/source/layouts/footer.njk b/source/layouts/footer.njk index 6fbb1b8..c4cf79e 100644 --- a/source/layouts/footer.njk +++ b/source/layouts/footer.njk @@ -7,29 +7,41 @@ - + - - + diff --git a/source/layouts/index.njk b/source/layouts/index.njk index c4912a7..9e2fde8 100644 --- a/source/layouts/index.njk +++ b/source/layouts/index.njk @@ -1,80 +1,80 @@ - - - - - + + + + + - + - + - {{ vars.title }} - - + {{ vars.title }} + + - - - - - + + + + + - - - - - + + + + + - {{ css }} + {{ css }} - + - + -
+
- {% include "navigation.njk" %} + {% include "navigation.njk" %} -
+
-

Research

- +

Research

+ -

General

- +

General

+ -
+
- {{ javascript }} + {{ javascript }} - {% include "footer.njk" %} + {% include "footer.njk" %} -
+
- + diff --git a/source/layouts/navigation.njk b/source/layouts/navigation.njk index 8814fc1..c5c6c80 100644 --- a/source/layouts/navigation.njk +++ b/source/layouts/navigation.njk @@ -3,9 +3,18 @@