From b01c8ce61c1bfb7b09efea39d719df005103248f Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 17 Nov 2024 12:42:48 +0100 Subject: [PATCH 1/5] Reorganise and simplify html of _layouts/main.html --- _layouts/main.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/_layouts/main.html b/_layouts/main.html index b785dbf..c25dd68 100644 --- a/_layouts/main.html +++ b/_layouts/main.html @@ -19,14 +19,12 @@ {% seo %} -
- {% include navigation.html icon-size="lg" %} -
-
- {{ content }} -
+ {% include navigation.html icon-size="lg" %} +
+
+ {{ content }}
- {% include footer.html icon-size="lg" %}
+ {% include footer.html icon-size="lg" %} From 56dc426264071cea02b42fd8ebadea3e9bcb0eee Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 17 Nov 2024 12:43:48 +0100 Subject: [PATCH 2/5] Remove hero class from _includes/navigation.html --- _includes/navigation.html | 62 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/_includes/navigation.html b/_includes/navigation.html index 4d314c2..f6c74bb 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -1,37 +1,35 @@ -
-
+ From 41e43a6cff613d60cac3dabc0fd18386ac5b007b Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 17 Nov 2024 17:54:47 +0100 Subject: [PATCH 3/5] Resolve conflict --- _includes/footer.html | 42 +++++++++++++----------------------------- _includes/footer.md | 4 ++++ 2 files changed, 17 insertions(+), 29 deletions(-) create mode 100644 _includes/footer.md diff --git a/_includes/footer.html b/_includes/footer.html index de16556..d48676d 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,29 +1,13 @@ -
- -
- +
+
+ {% capture content %}{% include footer.md %}{% endcapture %} + {{ content | markdownify }} + + + + + + + Creative Commons License CC BY-NC-SA 4.0 +
+
diff --git a/_includes/footer.md b/_includes/footer.md new file mode 100644 index 0000000..102ce96 --- /dev/null +++ b/_includes/footer.md @@ -0,0 +1,4 @@ +Template created by Alex Hernandez-Garcia, based on [alexhernandezgarcia.github.io](https://alexhernandezgarcia.github.io/). +The code relies on [jekyll](https://jekyllrb.com/) and [bulma](https://bulma.io/). +You are welcome to fork [the repository of this template](https://github.com/alexhernandezgarcia/template-personal-website) or [the original one](https://github.com/alexhernandezgarcia/alexhernandezgarcia.github.io/) to create your own website. + From 11226ef73bbe44a960ba0f40e2ce8687aecb0614 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 17 Nov 2024 12:51:47 +0100 Subject: [PATCH 4/5] Add license link to CC BY-NC-SA 4.0 in footer --- _includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index d48676d..54e7c43 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -8,6 +8,6 @@ - Creative Commons License CC BY-NC-SA 4.0 + Creative Commons License CC BY-NC-SA 4.0
From eb79448f632a363296f4aeadbb5340fcad7b81a7 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 17 Nov 2024 18:04:34 +0100 Subject: [PATCH 5/5] Adapt footer.md to content of alexhernandezgarcia --- _includes/footer.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/footer.md b/_includes/footer.md index 102ce96..75d5a8d 100644 --- a/_includes/footer.md +++ b/_includes/footer.md @@ -1,4 +1,4 @@ -Template created by Alex Hernandez-Garcia, based on [alexhernandezgarcia.github.io](https://alexhernandezgarcia.github.io/). -The code relies on [jekyll](https://jekyllrb.com/) and [bulma](https://bulma.io/). -You are welcome to fork [the repository of this template](https://github.com/alexhernandezgarcia/template-personal-website) or [the original one](https://github.com/alexhernandezgarcia/alexhernandezgarcia.github.io/) to create your own website. +Site created by Alex Hernandez-Garcia with [jekyll](https://jekyllrb.com/) and [bulma](https://bulma.io/). +The original version borrowed ideas from [pluskid.org](http://pluskid.org/). +You are welcome to fork [the repository of this website](https://github.com/alexhernandezgarcia/alexhernandezgarcia.github.io) or [this template repository](https://github.com/alexhernandezgarcia/template-personal-website) to create your own website.