From c2842783c79c778544a05b30bc3665cf6fb760eb Mon Sep 17 00:00:00 2001 From: Fettenderi Date: Tue, 5 Nov 2024 10:36:06 +0100 Subject: [PATCH] restyling --- config.toml | 17 ++-- content/_index.md | 30 ++++++- content/about.md | 30 ------- content/cv.md | 35 ++++++++ content/games/babel_ascent.md | 5 +- content/games/emperors_quest.md | 1 + content/games/no_brake.md | 2 + content/games/projectmecha_alien.md | 2 + content/games/punch_line.md | 1 + content/games/time_tangled.md | 1 + templates/cards_alt.html | 42 ---------- templates/homepage_alt.html | 27 ------ themes/apollo/sass/main.scss | 23 +----- themes/apollo/sass/parts/_cards.scss | 65 +++++++-------- themes/apollo/sass/parts/_dynamic.scss | 66 +++++++++++++++ themes/apollo/sass/parts/_footer.scss | 7 -- themes/apollo/sass/parts/_header.scss | 40 +++++---- themes/apollo/sass/parts/_homepage.scss | 23 +----- themes/apollo/sass/parts/_image.scss | 6 -- themes/apollo/sass/parts/_misc.scss | 35 -------- themes/apollo/sass/parts/_page.scss | 7 +- themes/apollo/sass/theme/babel.scss | 4 + themes/apollo/sass/theme/dark.scss | 10 ++- themes/apollo/static/js/animations.js | 13 +++ themes/apollo/templates/404.html | 1 + themes/apollo/templates/base.html | 6 -- themes/apollo/templates/cards.html | 75 +++++++++-------- themes/apollo/templates/homepage.html | 22 ++++- themes/apollo/templates/macros/macros.html | 86 ++++++++------------ themes/apollo/templates/partials/header.html | 39 ++------- themes/apollo/templates/partials/nav.html | 29 ++----- 31 files changed, 347 insertions(+), 403 deletions(-) delete mode 100644 content/about.md create mode 100644 content/cv.md delete mode 100644 templates/cards_alt.html delete mode 100644 templates/homepage_alt.html create mode 100644 themes/apollo/sass/parts/_dynamic.scss create mode 100644 themes/apollo/static/js/animations.js diff --git a/config.toml b/config.toml index 8db80e2..22ec2fe 100644 --- a/config.toml +++ b/config.toml @@ -1,11 +1,11 @@ theme = "apollo" -taxonomies = [{ name = "tags" }] # See this for more options: https://github.com/not-matthias/apollo/blob/main/config.toml#L14 # base_url = "https://fettenderimakes.games" base_url = "https://fettenderi.github.io" title = "Marco Manganaro" +description = "Technical Gameplay Designer" compile_sass = true minify_html = true @@ -18,14 +18,13 @@ highlight_code = true toc = true theme = "toggle" favicon = "/icon/favicon.png" -socials = [ - { name = "linktree", url = "https://linktr.ee/fettenderi", icon = "linktree" }, - { name = "itch.io", url = "https://fettenderi.itch.io", icon = "itchio" }, - { name = "github", url = "https://github.com/Fettenderi", icon = "github" }, - { name = "linkedin", url = "https://www.linkedin.com/in/marco-manganaro/", icon = "linkedin" }, -] +socials = [] menu = [ - { name = "/games", url = "/games", weight = 1 }, - { name = "/about", url = "/about", weight = 2 }, + { name = "/cv", url = "/cv", weight = 2 }, + { name = "/mail", url = "mailto:marco.manganaro03@gmail.com", weight = 2 }, + { name = "/linkedin", url = "https://www.linkedin.com/in/marco-manganaro/", weight = 2 }, + { name = "/github", url = "https://github.com/Fettenderi", weight = 2 }, + { name = "/itch.io", url = "https://fettenderi.itch.io", weight = 2 }, + { name = "/linktree", url = "https://linktr.ee/fettenderi", weight = 1 }, ] diff --git a/content/_index.md b/content/_index.md index c9d738b..fda8136 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,10 +1,34 @@ +++ -title= "Fettenderi" -template = "homepage_alt.html" +template = "homepage.html" [extra] site_title = "Fettenderi Makes Games" section_path = "games/_index.md" +++ -also known as Marco Manganaro is a sicilian [indie game developer](https://fettenderi.itch.io), [minecraft modder and map maker](https://www.planetminecraft.com/member/fettenderi/), currently studying software engineering and doing local game jams in turin. \ No newline at end of file +I’m a 21-year-old Sicilian software engineer studying at the Polytechnic University of Turin. My passion lies in crafting captivating, interactive experiences, especially through game mechanics that resonate with players. I see video games as a powerful art form that has the potential to engage, inspire, and connect. + +In my work with Minecraft, I design custom maps and mods focused on unique, immersive experiences. Combining level design with programming, I create tailored items and mechanics to bring each project to life, building worlds that captivate players with every interaction. + +Music is another source of inspiration for me; I enjoy exploring diverse genres and languages, and my playlists reflect this eclectic taste, often fueling my creativity. + + \ No newline at end of file diff --git a/content/about.md b/content/about.md deleted file mode 100644 index c3f0780..0000000 --- a/content/about.md +++ /dev/null @@ -1,30 +0,0 @@ -+++ -title = "About" -path = "about" - -[extra] -site_title = "Fettenderi: About" -+++ - -# Myself - -Hi, I'm Marco Manganaro, also known as Fettenderi. I'm a 21 year old Sicilian Software Engineering student at the Polytechnic University of Turin. Ever since I was a child I always wanted to make cool games that people will love to play and share. To me, videogames are more than just pure entertainment, it is also a very powerful art medium. - -I stepped foot on video game development in 2020 when I participated in [my first ever game jam](https://fettenderi.itch.io/nobrake). Later next year I worked on [Time Tangled](https://fettenderi.itch.io/time-tangled) of which I am most proud. - -In 2022 I started studying the principles of Game Design and applying them into my new projects in collaboration with some amazing people. The first being a game made with the composer [Unconcious Motifs](https://unconscious-motifs.itch.io) for the MechJam IV, and the second with "Armata Branca Leone" for the game [Punch Line](https://fettenderi.itch.io/punch-line) during the GlobalGameJam2024. - -These experiences taught me that game development is about making experiences and living ones. I learned communication and collaboration with other members of the game industry, I lived the fear of deadline and the joy of finishing a project with a team of people you have learned to work with. - -# Music - -Whether I'm commuting from university to home or studying, music is always a part of my daily routine. My favorite genres range from Italian hip-hop and nu jazz to video game soundtracks and Dutch alt-pop. To capture all my musical preferences, I've created a playlist that reflects my diverse tastes. - - - -# Contact - -Do you want to work with me? You can: -- Dm me on discord as 'fettenderi' -- Message me on [linkedin](https://www.linkedin.com/in/marco-manganaro/) -- Mail me at 'fettenderi.marco@gmail.com' \ No newline at end of file diff --git a/content/cv.md b/content/cv.md new file mode 100644 index 0000000..4fc3f88 --- /dev/null +++ b/content/cv.md @@ -0,0 +1,35 @@ ++++ +template = "page.html" +title = "Resume" + +[extra] +site_title = "Resume" ++++ + +Paraponzi ponzi po + + \ No newline at end of file diff --git a/content/games/babel_ascent.md b/content/games/babel_ascent.md index a63c45b..cc86565 100644 --- a/content/games/babel_ascent.md +++ b/content/games/babel_ascent.md @@ -6,11 +6,12 @@ weight = 6 [extra] local_image = "/games/babel_ascent.png" +tags=["godot-engine", "team", "lead designer", "technical gameplay designer", "vr", "shader"] babel = true +++
- - + +
After working on a few small projects in VR, I wanted to create an actual game using my acquired knowledge. So [UnconsciousMotifs](https://unconscious-motifs.itch.io), [BatFerro](https://itch.io/profile/andrea-ferretti) and I were full of energy to start working on this project. diff --git a/content/games/emperors_quest.md b/content/games/emperors_quest.md index 5997aac..dd4bff6 100644 --- a/content/games/emperors_quest.md +++ b/content/games/emperors_quest.md @@ -5,6 +5,7 @@ date = "2024-05-27" weight = 5 [extra] +tags=["godot-engine", "solo", "gameplay design", "system design"] local_image = "/games/emperors_quest.png" +++ diff --git a/content/games/no_brake.md b/content/games/no_brake.md index b5ae6c2..1414374 100644 --- a/content/games/no_brake.md +++ b/content/games/no_brake.md @@ -5,7 +5,9 @@ date = "2020-11-15" weight = 1 [extra] +tags=["godot-engine", "solo", "3d"] local_image = "/games/no_brake.png" +ignore = true +++ This is my first ever attempt at videogame development, before this I only followed some tutorials about the Godot Engine and Blender. diff --git a/content/games/projectmecha_alien.md b/content/games/projectmecha_alien.md index dd7727e..d8a4eba 100644 --- a/content/games/projectmecha_alien.md +++ b/content/games/projectmecha_alien.md @@ -5,7 +5,9 @@ date = "2023-07-20" weight = 3 [extra] +tags=["godot-engine", "team", "3d", "technical designer"] local_image = "/games/projectmecha_alien.png" +ignore = true +++ After a two-year break from game development, I joined MechJam IV, and for the first time, I wasn’t working alone. I had the opportunity to collaborate with an amazing composer experienced with Wwise and FMOD. diff --git a/content/games/punch_line.md b/content/games/punch_line.md index a8ab3d4..89199a2 100644 --- a/content/games/punch_line.md +++ b/content/games/punch_line.md @@ -5,6 +5,7 @@ date = "2024-01-28" weight = 4 [extra] +tags=["unity-engine", "team","junior programmer", "typing"] local_image = "/games/punch_line.png" +++ diff --git a/content/games/time_tangled.md b/content/games/time_tangled.md index 9a44367..c2d8924 100644 --- a/content/games/time_tangled.md +++ b/content/games/time_tangled.md @@ -5,6 +5,7 @@ date = "2021-05-22" weight = 2 [extra] +tags=["godot-engine", "solo", "bullet-hell"] local_image = "/games/time_tangled.png" +++ diff --git a/templates/cards_alt.html b/templates/cards_alt.html deleted file mode 100644 index c86450f..0000000 --- a/templates/cards_alt.html +++ /dev/null @@ -1,42 +0,0 @@ -{% macro cards_posts(pages) %} -
- {%- for page in pages %} -
- {% if page.extra.local_image %} - - {{ - - {% else %} -
- {% endif %} - -
-

- {% if page.extra.link_to %} - {{ page.title }} - {% else %} - {{ page.title }} - {% endif %} -

- -
- {%- if page.date %} - - {% endif -%} - {% if page.draft %} - DRAFT - {% endif %} -
- -
- {% if page.description %} - {{ page.description }} - {% endif %} -
-
-
- - {% endfor -%} -
-{% endmacro cards_posts %} \ No newline at end of file diff --git a/templates/homepage_alt.html b/templates/homepage_alt.html deleted file mode 100644 index 9f4999d..0000000 --- a/templates/homepage_alt.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "base.html" %} -{% import "cards_alt.html" as cards_alt %} - -{% block main_content %} -
-
-
- -
- {{post_macros::page_header(title=section.title)}} - {{ section.content | safe }} -
- -
- {% if section.extra.section_path -%} - {% set section = get_section(path=section.extra.section_path) %} - {%- set show_pages = section.pages -%} - - {{ cards_alt::cards_posts(pages=show_pages) }} - - {% endif -%} -
-
-
-
- -{% endblock main_content %} diff --git a/themes/apollo/sass/main.scss b/themes/apollo/sass/main.scss index 3eebe61..ec0de89 100644 --- a/themes/apollo/sass/main.scss +++ b/themes/apollo/sass/main.scss @@ -10,6 +10,7 @@ @import "parts/_homepage.scss"; @import "parts/_footer.scss"; @import "parts/_page.scss"; +@import "parts/_dynamic.scss"; :root { /* Used for: block comment, hr, ... */ @@ -29,26 +30,8 @@ html { } .content { - max-width: 1000px; + max-width: 1200px; margin: 0 auto; - padding: 0 24px; + padding: 0 4em; word-wrap: break-word; -} - -@media all and (min-width:640px) { - html { - font-size: 16.5px; - } -} - -@media all and (min-width:720px) { - html { - font-size: 17px; - } -} - -@media all and (min-width:960px) { - html { - font-size: 18px; - } } \ No newline at end of file diff --git a/themes/apollo/sass/parts/_cards.scss b/themes/apollo/sass/parts/_cards.scss index a24098c..744a203 100644 --- a/themes/apollo/sass/parts/_cards.scss +++ b/themes/apollo/sass/parts/_cards.scss @@ -5,26 +5,6 @@ padding: 12px 0; } -.cards-alt { - display: flex; - flex-wrap: wrap; - grid-template-rows: auto; - gap: 24px; - padding: 12px 0; -} - -@media all and (min-width: 640px) { - .cards { - grid-template-columns: repeat(auto-fill, minmax(400px, 1fr)); - } -} - -@media all and (max-width: 640px) { - .cards { - grid-template-columns: repeat(auto-fill, 1fr); - } -} - .card { min-height: 100px; background: var(--bg-1); @@ -33,18 +13,32 @@ overflow: hidden; } -.card-alt { - min-height: 100px; - background: var(--bg-1); - border: 2px solid var(--border-color); - border-radius: 10px; - overflow: hidden; -} - .card-info { padding: 0 24px 24px 24px; } +.card-title { + white-space: nowrap; + font-size: 1.5rem; +} + +.card-tags { + display: flex; + flex-wrap: wrap; + justify-content: flex-start; +} + +.card-tag { + display: inline-block; + padding: 0.1em 0.8em; + margin-right: 0.4em; + border-radius: 4em; + color: var(--card-tags); + font-size: 0.8rem; + text-align: center; + white-space: nowrap; +} + .card-title { margin-top: 0.7em; } @@ -52,7 +46,14 @@ .card-image { border: unset; width: 100%; - // max-height: 50%; + height: 100%; + object-fit: cover; +} + +.card-image-container { + width: 100%; + overflow: hidden; + aspect-ratio: 21 / 9; } .card-image-links { @@ -68,10 +69,4 @@ .card-description { margin-top: 0.5em; overflow: hidden; -} - -@media all and (max-width:720px) { - .cards { - gap: 18px; - } } \ No newline at end of file diff --git a/themes/apollo/sass/parts/_dynamic.scss b/themes/apollo/sass/parts/_dynamic.scss new file mode 100644 index 0000000..90e2433 --- /dev/null +++ b/themes/apollo/sass/parts/_dynamic.scss @@ -0,0 +1,66 @@ +html { + font-size: calc(16px + (18 - 16) * ((100vw - 640px) / (960 - 640))); +} + +// @keyframes fadeInUp { +// 0% { +// opacity: 0; /* Inizio completamente trasparente */ +// transform: translateY(20px); /* Posizione iniziale spostata verso il basso */ +// } +// 100% { +// opacity: 1; /* Completamente visibile */ +// transform: translateY(0); /* Posizione finale (nessuno spostamento) */ +// } +// } + +// div { +// opacity: 1; /* Nascondi inizialmente l'elemento */ +// } + +// div.animate { +// animation: fadeInUp 1s ease-out forwards; /* Applica l'animazione al trigger */ +// } + +@media (max-width: 1100px) { + header { + flex-direction: column; + align-items: center; + padding: 2em 0 0.6em; + } + + header .main { + display: flex; + text-align: center; + flex-direction: column; + align-items: center; + padding: 0 0 0.6em; + } + + #text { + padding: 0 3em 1em 3em; + } + + nav { + display: flex; + align-items: center; + justify-content: center; + } +} + +@media all and (min-width: 640px) { + .cards { + grid-template-columns: repeat(auto-fill, minmax(400px, 1fr)); + } +} + +@media all and (max-width: 640px) { + .cards { + grid-template-columns: repeat(auto-fill, 1fr); + } +} + +@media all and (max-width:720px) { + .cards { + gap: 18px; + } +} \ No newline at end of file diff --git a/themes/apollo/sass/parts/_footer.scss b/themes/apollo/sass/parts/_footer.scss index 423b0f9..831b200 100644 --- a/themes/apollo/sass/parts/_footer.scss +++ b/themes/apollo/sass/parts/_footer.scss @@ -4,11 +4,4 @@ footer { padding-bottom: 3rem; margin-top: 3rem; font-size: 0.9rem; - background-color: var(--bg-3); -} - -@media (max-width: 768px) { - footer { - font-size: 0.8rem; - } } \ No newline at end of file diff --git a/themes/apollo/sass/parts/_header.scss b/themes/apollo/sass/parts/_header.scss index c7e5ef7..0ff4624 100644 --- a/themes/apollo/sass/parts/_header.scss +++ b/themes/apollo/sass/parts/_header.scss @@ -1,8 +1,29 @@ +#title { + font-size: 1.1em; + letter-spacing: 1px; +} + +#description { + font-size: 0.65em; + letter-spacing: 1px; + padding-top: 10px; +} + +nav { + flex-wrap: wrap; + align-items: flex-end; +} + +#menu-item { + margin-left: 0.5em; + display: inline-block; +} + .page-header { font-size: 2.5em; line-height: 100%; font-family: var(--header-font); - margin: 3rem 0px 2rem 0px; + margin: 1rem 0px 1rem 0px; } .centered-header { @@ -21,7 +42,7 @@ header { flex-direction: row; flex-wrap: wrap; justify-content: space-between; - padding: 1em 0; + padding: 4em 0 1em 0; } header .main { @@ -31,7 +52,7 @@ header .main { justify-content: space-between; align-items: flex-start; gap: 12px; - font-size: 1.5rem; + font-size: 1.9rem; /* Otherwise header and menu is too close on small screens*/ margin-bottom: 5px; @@ -76,19 +97,6 @@ header .socials { height: 24px; } -/* Mobile-specific adjustments */ -@media (max-width: 768px) { - header { - flex-direction: column; - align-items: center; - padding: 1em 0; - } - - header .main a { - font-size: 20px; - } -} - .meta { color: #999; display: flexbox; diff --git a/themes/apollo/sass/parts/_homepage.scss b/themes/apollo/sass/parts/_homepage.scss index 44919f3..29a7854 100644 --- a/themes/apollo/sass/parts/_homepage.scss +++ b/themes/apollo/sass/parts/_homepage.scss @@ -1,21 +1,6 @@ -#text { - width: 40%; - padding-right: 100px; -} - -#home { - display: flex; - flex-wrap: nowrap; -} -@media (max-width: 768px) { - #text { - width: auto; - padding-right: 0px; - } - - #home { - display: contents; - flex-wrap: nowrap; - } +#text { + text-align: center; + font-size: 0.85em; + padding: 0 7em 1em 6em; } \ No newline at end of file diff --git a/themes/apollo/sass/parts/_image.scss b/themes/apollo/sass/parts/_image.scss index 447f930..336a023 100644 --- a/themes/apollo/sass/parts/_image.scss +++ b/themes/apollo/sass/parts/_image.scss @@ -14,12 +14,6 @@ figure img { max-height: 500px; } -@media screen and (min-width: 600px) { - figure { - padding: 0 40px; - } -} - figure h4 { font-size: 1rem; margin: 0; diff --git a/themes/apollo/sass/parts/_misc.scss b/themes/apollo/sass/parts/_misc.scss index 7f31428..026d268 100644 --- a/themes/apollo/sass/parts/_misc.scss +++ b/themes/apollo/sass/parts/_misc.scss @@ -80,41 +80,6 @@ del { text-decoration-thickness: 3px; } -@media all and (max-width: 640px) { - .post-header { - display: grid; - grid-template-rows: auto 1fr; - - h1 { - margin-top: 0; - // font-size: 130%; - - a { - border-bottom: none; - } - } - } -} - -/* Post list */ -@media all and (min-width: 640px) { - .post-header { - display: grid; - gap: 1rem; - grid-row-gap: 1.5rem; - grid-template-columns: auto 1fr; - - h1 { - margin: 0; - font-size: 130%; - - a { - border-bottom: none; - } - } - } -} - /* Remove styling from theme toggle button */ #dark-mode-toggle { border-bottom: none; diff --git a/themes/apollo/sass/parts/_page.scss b/themes/apollo/sass/parts/_page.scss index 6d80c1b..bb57138 100644 --- a/themes/apollo/sass/parts/_page.scss +++ b/themes/apollo/sass/parts/_page.scss @@ -5,13 +5,18 @@ } .gallery-gif, -.gallery-image { +.gallery-image, +.gallery-video { flex-grow: 1; border-color: transparent; border-radius: 5px; margin: 0.2rem; } +.gallery-video { + aspect-ratio: 16 / 9; +} + .text-button { border: solid; border-width: 100%; diff --git a/themes/apollo/sass/theme/babel.scss b/themes/apollo/sass/theme/babel.scss index a7d7d83..080e5fb 100644 --- a/themes/apollo/sass/theme/babel.scss +++ b/themes/apollo/sass/theme/babel.scss @@ -7,6 +7,10 @@ $white: #F7EEDC; --primary-color: #{$white}; --secondary-color: #{$white}; + --card-tags-bg-1: #{$white}; + --card-tags-bg-2: #{$white}; + --card-tags: #{$black}; + --bg-0: #{$black}; --bg-1: #{$black}; --bg-2: #{$black}; diff --git a/themes/apollo/sass/theme/dark.scss b/themes/apollo/sass/theme/dark.scss index 8988582..4589880 100644 --- a/themes/apollo/sass/theme/dark.scss +++ b/themes/apollo/sass/theme/dark.scss @@ -14,16 +14,18 @@ $accent-color: #e3a049; :root.dark { --text-0: #{$text}; --text-1: #{$text}; + --primary-color: #{$primary-color}; + --secondary-color: #{$accent-color}; + + --card-tags-bg-1: #{$footer-bg}; + --card-tags-bg-2: #{$card-bg}; + --card-tags: #{$text}; --bg-0: #{$page-bg}; --bg-1: #{$card-bg}; --bg-2: #{$border-bg}; --bg-3: #{$footer-bg}; - --border-color: var(--bg-2); - - --primary-color: #{$primary-color}; - --secondary-color: #{$accent-color}; --hover-color: #{$hover}; .social-icon { diff --git a/themes/apollo/static/js/animations.js b/themes/apollo/static/js/animations.js new file mode 100644 index 0000000..5c05e3b --- /dev/null +++ b/themes/apollo/static/js/animations.js @@ -0,0 +1,13 @@ +// document.addEventListener("DOMContentLoaded", function () { +// const observer = new IntersectionObserver((entries) => { +// entries.forEach((entry) => { +// if (entry.isIntersecting) { +// entry.target.classList.add("animate"); // Aggiunge la classe di animazione +// observer.unobserve(entry.target); // Ferma l'osservazione dopo l'animazione +// } +// }); +// }, { threshold: 0.1 }); // Avvia l'animazione quando il 10% dell'elemento è visibile + +// const elements = document.querySelectorAll("div"); +// elements.forEach((el) => observer.observe(el)); +// }); diff --git a/themes/apollo/templates/404.html b/themes/apollo/templates/404.html index 8198eda..928895e 100644 --- a/themes/apollo/templates/404.html +++ b/themes/apollo/templates/404.html @@ -10,6 +10,7 @@
{% include "partials/nav.html" %}
+





{{ post_macros::page_header(title="404")}} Page not found :( diff --git a/themes/apollo/templates/base.html b/themes/apollo/templates/base.html index 1d52c5b..610784a 100644 --- a/themes/apollo/templates/base.html +++ b/themes/apollo/templates/base.html @@ -14,12 +14,6 @@ {% block main_content %} Nothing here?! {% endblock main_content %} - - {% if config.extra.comment | default(value=false) %} -
- {% include "_giscus_script.html" %} - {% endif %} -
{% include "partials/footer.html" %} diff --git a/themes/apollo/templates/cards.html b/themes/apollo/templates/cards.html index 2c67f32..52aad6d 100644 --- a/themes/apollo/templates/cards.html +++ b/themes/apollo/templates/cards.html @@ -1,35 +1,44 @@ -{% extends "base.html" %} - -{% block main_content %} - {% if section.extra.section_path -%} - {% set section = get_section(path=section.extra.section_path) %} - {% endif -%} - - {{ post_macros::page_header(title=section.title) }} - -
- {%- if paginator %} - {%- set show_pages = paginator.pages -%} - {% else %} - {%- set show_pages = section.pages -%} - {% endif -%} - - {{ post_macros::cards_posts(pages=show_pages) }} -
- - {% if paginator %} - - {% endif %} -{% endblock main_content %} \ No newline at end of file +
+

+ {% if page.extra.link_to %} + {{ page.title }} + {% else %} + {{ page.title }} + {% endif %} +

+ +
+ {% if page.extra.tags %} + {% set tags = page.extra.tags%} + {% for tag in tags %} + + #{{ tag }} + + {% endfor %} + {% endif %} +
+ +
+ + {% endif %} + {% endfor -%} + +{% endmacro cards_posts %} \ No newline at end of file diff --git a/themes/apollo/templates/homepage.html b/themes/apollo/templates/homepage.html index 9bf49d5..48c6844 100644 --- a/themes/apollo/templates/homepage.html +++ b/themes/apollo/templates/homepage.html @@ -1,5 +1,25 @@ {% extends "base.html" %} +{% import "cards.html" as cards %} {% block main_content %} - {{ post_macros::home_page(section=section) }} +
+
+
+
+ {{ section.content | safe }} +
+ +
+ {% if section.extra.section_path -%} + {% set section = get_section(path=section.extra.section_path) %} + {%- set show_pages = section.pages -%} + + {{ cards::cards_posts(pages=show_pages) }} + + {% endif -%} +
+
+
+
+ {% endblock main_content %} diff --git a/themes/apollo/templates/macros/macros.html b/themes/apollo/templates/macros/macros.html index 9d1daef..397f395 100644 --- a/themes/apollo/templates/macros/macros.html +++ b/themes/apollo/templates/macros/macros.html @@ -85,14 +85,9 @@

{% endif -%} {% endmacro tags %} -{% macro page_header(title, image="") %} +{% macro page_header(title) %}
{{ title }}. - - -
{% endmacro content %} @@ -111,60 +106,45 @@

- {#

{{ page.title }}

#} - - {% if page.extra.banner_image %} - {{ post_macros::page_header(title = page.title, image = page.extra.banner_image) }} - {% else %} - {{ post_macros::page_header(title=page.title) }} - {% endif %} - - -
- {% if page.date %} - Posted on - {% endif %} - - {% if page.updated %} - :: Updated on - {% endif %} + {#

{{ page.title }}

#} + + {{ post_macros::page_header(title=page.title) }} + +
+ {% if page.extra.tags %} + {% set tags = page.extra.tags%} + {% for tag in tags %} + + #{{ tag }} + + {% endfor %} + {% endif %} +
- {% if page.extra.read_time %} - :: Min Read - {% endif %} - {# Inline display of tags directly after the date #} - {% if page.taxonomies and page.taxonomies.tags %} - :: Tags: - - {%- for tag in page.taxonomies.tags %} - {{ tag }}{% if not loop.last %}, {% endif %} - {% endfor %} - +
+ {# View the page on GitHub #} + {% if page.extra.repo_view | default(value=false) %} + {# Use the page's repo_url if defined, otherwise use the global edit_repo_url #} + {% if page.extra.repo_url is defined %} + {% set repo_url = page.extra.repo_url %} + {% elif config.extra.repo_url is defined %} + {% set repo_url = config.extra.repo_url %} + {% else %} + {% set repo_url = false %} {% endif %} - {# View the page on GitHub #} - {% if page.extra.repo_view | default(value=false) %} - {# Use the page's repo_url if defined, otherwise use the global edit_repo_url #} - {% if page.extra.repo_url is defined %} - {% set repo_url = page.extra.repo_url %} - {% elif config.extra.repo_url is defined %} - {% set repo_url = config.extra.repo_url %} - {% else %} - {% set repo_url = false %} - {% endif %} - - {% if repo_url %} - {% set final_url = repo_url ~ page.relative_path %} - :: Source Code - {% endif %} + {% if repo_url %} + {% set final_url = repo_url ~ page.relative_path %} + :: Source Code {% endif %} + {% endif %} - {% if page.draft %} - DRAFT - {% endif %} + {% if page.draft %} + DRAFT + {% endif %} -
+
{% if page.extra.tldr %} diff --git a/themes/apollo/templates/partials/header.html b/themes/apollo/templates/partials/header.html index 83962e2..64b2a12 100644 --- a/themes/apollo/templates/partials/header.html +++ b/themes/apollo/templates/partials/header.html @@ -153,44 +153,15 @@ {% if page.extra.babel %} - - - - - + + + {% else %} - - {% set theme = config.extra.theme | default(value="toggle") %} - {% if theme == "dark" %} - {% elif theme == "light" %} - - {% elif theme == "auto" %} - - - {% elif theme == "toggle" %} - - - {% endif %} - - - {% if theme == "dark" %} + + - {% elif theme == "light" %} - - {% elif theme == "auto" %} - - {% else %} - - {% endif %} - {% endif %} diff --git a/themes/apollo/templates/partials/nav.html b/themes/apollo/templates/partials/nav.html index 7ec97f2..0215732 100644 --- a/themes/apollo/templates/partials/nav.html +++ b/themes/apollo/templates/partials/nav.html @@ -1,29 +1,18 @@
- {{ config.title }} - -
- {% for social in config.extra.socials | default(value=[]) %} - - {% endfor %} -
+ + + {{ config.title }} + +
+ {{ config.description }} +
+