From d56876a142027228e5979df24fa84d911f8949a6 Mon Sep 17 00:00:00 2001 From: Allen <63997543+aaw3@users.noreply.github.com> Date: Sun, 15 Sep 2024 22:28:22 -0500 Subject: [PATCH] Add changes --- .gitignore | 1 - config.toml | 2 +- static/style.css | 14 ++++++++++++ templates/base.html | 4 ++++ templates/cards/columns.html | 44 +++++++++++++++++++++++++++--------- templates/index.html | 4 ++-- theme.toml | 6 ++--- 7 files changed, 57 insertions(+), 18 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 87174b6..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/public/ diff --git a/config.toml b/config.toml index b0e9cfa..153a58e 100644 --- a/config.toml +++ b/config.toml @@ -14,4 +14,4 @@ highlight_code = false [extra] # Put all your custom variables here -name = { first = "john", last = "doe" } +#name = { first = "Allen", last = "Wolf" } diff --git a/static/style.css b/static/style.css index 9ca0c0f..e69d6c3 100644 --- a/static/style.css +++ b/static/style.css @@ -288,4 +288,18 @@ body::-webkit-scrollbar { border-color: white; background-color: var(--light-purple); color: white; +} + +#roles a { + color: var(--light-purple); +} + +.card a { + color: var(--light-purple); +} + +.white_filter { + -webkit-filter: brightness(0) invert(1); + filter: brightness(0) invert(1); + transition: filter 0.3s ease; } \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index f6d3765..ed70018 100644 --- a/templates/base.html +++ b/templates/base.html @@ -20,8 +20,12 @@ {% block content %}{% endblock -%} + +
Hayflow Theme by Cyril Marpaud, licensed under CC BY-SA 4.0
+ + diff --git a/templates/cards/columns.html b/templates/cards/columns.html index e1ddf0f..843bdb5 100644 --- a/templates/cards/columns.html +++ b/templates/cards/columns.html @@ -1,12 +1,34 @@ {{ section.content | safe }} -
- {%- for page in section.pages %} -
-

{{ page.title }}

- {% for icon in page.extra.icons | default(value=[]) -%} - - {%- endfor %} - {{ page.content | safe }} -
- {%- endfor %} -
+
+ {%- for page in section.pages %} + {% set link = page.extra.link | default(value="") %} + {%- if link != "" %} + +
+ {%- else %} +
+ {%- endif %} +

{{ page.title }}

+ + {# FontAwesome Icons #} + {% for icon in page.extra.icons | default(value=[]) -%} + + {%- endfor %} + + {# Image Icons #} + {% set img = page.extra.img | default(value="") %} + {% set img_class = page.extra.img_class | default(value="") %} + {% if img != "" %} + {% set width = page.extra.img_width | default(value="50") %} + {% set height = page.extra.img_height | default(value="50") %} + {{ page.title }} + {% endif %} + + {{ page.content | safe }} +
+ {%- if link != "" %} + + {%- endif %} + {%- endfor %} +
diff --git a/templates/index.html b/templates/index.html index 207fb6d..2752c64 100644 --- a/templates/index.html +++ b/templates/index.html @@ -35,7 +35,7 @@

{%- for role in section.extra.roles %} - {{ role }}
+ {{ role | safe }}
{%- endfor %}

@@ -45,7 +45,7 @@ diff --git a/theme.toml b/theme.toml index 836e88b..2f3c5cc 100644 --- a/theme.toml +++ b/theme.toml @@ -12,9 +12,9 @@ demo = "https://cyril-marpaud.gitlab.io" # be merged with user data, some kind of prefix or nesting is preferable # Use snake_casing to be consistent with the rest of Zola [extra] -name = { first = "John", last = "Doe" } +#name = { first = "Allen", last = "Wolf" } # The theme author info: you! [author] -name = "Cyril Marpaud" -homepage = "https://cyril-marpaud.gitlab.io" +name = "Allen Wolf" +homepage = "https://aaw3.dev"