From 1e9aced66d72f309c985e027259a962264fe6538 Mon Sep 17 00:00:00 2001 From: Ethan Marshall Date: Mon, 12 Aug 2024 17:39:05 +0100 Subject: [PATCH] Clean up and make more minimal Removed dependence on fontawesome for three icons --- hugo.toml | 24 +++----------- .../risotto/{static => assets}/css/about.css | 0 .../{static => assets}/css/colours.css | 0 .../risotto/{static => assets}/css/custom.css | 0 .../risotto/{static => assets}/css/footer.css | 0 .../risotto/{static => assets}/css/header.css | 0 themes/risotto/assets/css/icons.css | 11 +++++++ .../risotto/{static => assets}/css/layout.css | 0 .../risotto/{static => assets}/css/logo.css | 0 .../css/palettes/apprentice.css | 0 .../css/palettes/base16-dark.css | 0 .../css/palettes/base16-light.css | 0 .../css/palettes/dracula.css | 0 .../css/palettes/gruvbox-dark.css | 0 .../css/palettes/gruvbox-light.css | 0 .../css/palettes/material.css | 0 .../css/palettes/papercolor-dark.css | 0 .../css/palettes/papercolor-light.css | 0 .../css/palettes/solarized-dark.css | 0 .../css/palettes/solarized-light.css | 0 .../css/palettes/tender.css | 0 .../css/palettes/tokyo-night-dark.css | 0 .../css/palettes/tokyo-night-light.css | 0 .../css/palettes/windows-95-light.css | 0 .../css/palettes/windows-95.css | 0 themes/risotto/assets/css/risotto.css | 7 ++++ .../{static => assets}/css/typography.css | 0 themes/risotto/layouts/partials/about.html | 33 ++++++++++++++++--- themes/risotto/layouts/partials/head.html | 8 ++--- themes/risotto/static/css/risotto.css | 12 ------- 30 files changed, 54 insertions(+), 41 deletions(-) rename themes/risotto/{static => assets}/css/about.css (100%) rename themes/risotto/{static => assets}/css/colours.css (100%) rename themes/risotto/{static => assets}/css/custom.css (100%) rename themes/risotto/{static => assets}/css/footer.css (100%) rename themes/risotto/{static => assets}/css/header.css (100%) create mode 100644 themes/risotto/assets/css/icons.css rename themes/risotto/{static => assets}/css/layout.css (100%) rename themes/risotto/{static => assets}/css/logo.css (100%) rename themes/risotto/{static => assets}/css/palettes/apprentice.css (100%) rename themes/risotto/{static => assets}/css/palettes/base16-dark.css (100%) rename themes/risotto/{static => assets}/css/palettes/base16-light.css (100%) rename themes/risotto/{static => assets}/css/palettes/dracula.css (100%) rename themes/risotto/{static => assets}/css/palettes/gruvbox-dark.css (100%) rename themes/risotto/{static => assets}/css/palettes/gruvbox-light.css (100%) rename themes/risotto/{static => assets}/css/palettes/material.css (100%) rename themes/risotto/{static => assets}/css/palettes/papercolor-dark.css (100%) rename themes/risotto/{static => assets}/css/palettes/papercolor-light.css (100%) rename themes/risotto/{static => assets}/css/palettes/solarized-dark.css (100%) rename themes/risotto/{static => assets}/css/palettes/solarized-light.css (100%) rename themes/risotto/{static => assets}/css/palettes/tender.css (100%) rename themes/risotto/{static => assets}/css/palettes/tokyo-night-dark.css (100%) rename themes/risotto/{static => assets}/css/palettes/tokyo-night-light.css (100%) rename themes/risotto/{static => assets}/css/palettes/windows-95-light.css (100%) rename themes/risotto/{static => assets}/css/palettes/windows-95.css (100%) create mode 100644 themes/risotto/assets/css/risotto.css rename themes/risotto/{static => assets}/css/typography.css (100%) delete mode 100644 themes/risotto/static/css/risotto.css diff --git a/hugo.toml b/hugo.toml index 5a436cc..23e2315 100644 --- a/hugo.toml +++ b/hugo.toml @@ -18,25 +18,11 @@ palette = "gruvbox-dark" title = "Ethan Marshall" description = "A programmer who, to preserve his sanity, took refuge in electrical engineering. What an idiot." -[[params.socialLinks]] -icon = "fa-brands fa-github" -title = "GitHub" -url = "https://github.com/ejv2" - -[[params.socialLinks]] -icon = "fa-brands fa-steam" -title = "Steam" -url = "https://steamcommunity.com/id/ejmv2" - -[[params.socialLinks]] -icon = "fa-solid fa-envelope" -title = "Email" -url = "/contact" - -[[params.socialLinks]] -icon = "fa-solid fa-rss" -title = "RSS" -url = "/blog/index.xml" +[params.socialLinks] +github = "https://github.com/ejv2" +steam = "https://steamcommunity.com/id/ejmv2" +email = "/contact/" +rss = "/blog/index.xml" [menu] [[menu.main]] diff --git a/themes/risotto/static/css/about.css b/themes/risotto/assets/css/about.css similarity index 100% rename from themes/risotto/static/css/about.css rename to themes/risotto/assets/css/about.css diff --git a/themes/risotto/static/css/colours.css b/themes/risotto/assets/css/colours.css similarity index 100% rename from themes/risotto/static/css/colours.css rename to themes/risotto/assets/css/colours.css diff --git a/themes/risotto/static/css/custom.css b/themes/risotto/assets/css/custom.css similarity index 100% rename from themes/risotto/static/css/custom.css rename to themes/risotto/assets/css/custom.css diff --git a/themes/risotto/static/css/footer.css b/themes/risotto/assets/css/footer.css similarity index 100% rename from themes/risotto/static/css/footer.css rename to themes/risotto/assets/css/footer.css diff --git a/themes/risotto/static/css/header.css b/themes/risotto/assets/css/header.css similarity index 100% rename from themes/risotto/static/css/header.css rename to themes/risotto/assets/css/header.css diff --git a/themes/risotto/assets/css/icons.css b/themes/risotto/assets/css/icons.css new file mode 100644 index 0000000..e2e35bd --- /dev/null +++ b/themes/risotto/assets/css/icons.css @@ -0,0 +1,11 @@ +.brand-icons { + max-width: 15.5px; + max-height: 16px; + padding: 0px; + fill: var(--link); + display: inline-block; +} + +.brand-icons:hover, .brand-icons:active { + fill: var(--hover); +} diff --git a/themes/risotto/static/css/layout.css b/themes/risotto/assets/css/layout.css similarity index 100% rename from themes/risotto/static/css/layout.css rename to themes/risotto/assets/css/layout.css diff --git a/themes/risotto/static/css/logo.css b/themes/risotto/assets/css/logo.css similarity index 100% rename from themes/risotto/static/css/logo.css rename to themes/risotto/assets/css/logo.css diff --git a/themes/risotto/static/css/palettes/apprentice.css b/themes/risotto/assets/css/palettes/apprentice.css similarity index 100% rename from themes/risotto/static/css/palettes/apprentice.css rename to themes/risotto/assets/css/palettes/apprentice.css diff --git a/themes/risotto/static/css/palettes/base16-dark.css b/themes/risotto/assets/css/palettes/base16-dark.css similarity index 100% rename from themes/risotto/static/css/palettes/base16-dark.css rename to themes/risotto/assets/css/palettes/base16-dark.css diff --git a/themes/risotto/static/css/palettes/base16-light.css b/themes/risotto/assets/css/palettes/base16-light.css similarity index 100% rename from themes/risotto/static/css/palettes/base16-light.css rename to themes/risotto/assets/css/palettes/base16-light.css diff --git a/themes/risotto/static/css/palettes/dracula.css b/themes/risotto/assets/css/palettes/dracula.css similarity index 100% rename from themes/risotto/static/css/palettes/dracula.css rename to themes/risotto/assets/css/palettes/dracula.css diff --git a/themes/risotto/static/css/palettes/gruvbox-dark.css b/themes/risotto/assets/css/palettes/gruvbox-dark.css similarity index 100% rename from themes/risotto/static/css/palettes/gruvbox-dark.css rename to themes/risotto/assets/css/palettes/gruvbox-dark.css diff --git a/themes/risotto/static/css/palettes/gruvbox-light.css b/themes/risotto/assets/css/palettes/gruvbox-light.css similarity index 100% rename from themes/risotto/static/css/palettes/gruvbox-light.css rename to themes/risotto/assets/css/palettes/gruvbox-light.css diff --git a/themes/risotto/static/css/palettes/material.css b/themes/risotto/assets/css/palettes/material.css similarity index 100% rename from themes/risotto/static/css/palettes/material.css rename to themes/risotto/assets/css/palettes/material.css diff --git a/themes/risotto/static/css/palettes/papercolor-dark.css b/themes/risotto/assets/css/palettes/papercolor-dark.css similarity index 100% rename from themes/risotto/static/css/palettes/papercolor-dark.css rename to themes/risotto/assets/css/palettes/papercolor-dark.css diff --git a/themes/risotto/static/css/palettes/papercolor-light.css b/themes/risotto/assets/css/palettes/papercolor-light.css similarity index 100% rename from themes/risotto/static/css/palettes/papercolor-light.css rename to themes/risotto/assets/css/palettes/papercolor-light.css diff --git a/themes/risotto/static/css/palettes/solarized-dark.css b/themes/risotto/assets/css/palettes/solarized-dark.css similarity index 100% rename from themes/risotto/static/css/palettes/solarized-dark.css rename to themes/risotto/assets/css/palettes/solarized-dark.css diff --git a/themes/risotto/static/css/palettes/solarized-light.css b/themes/risotto/assets/css/palettes/solarized-light.css similarity index 100% rename from themes/risotto/static/css/palettes/solarized-light.css rename to themes/risotto/assets/css/palettes/solarized-light.css diff --git a/themes/risotto/static/css/palettes/tender.css b/themes/risotto/assets/css/palettes/tender.css similarity index 100% rename from themes/risotto/static/css/palettes/tender.css rename to themes/risotto/assets/css/palettes/tender.css diff --git a/themes/risotto/static/css/palettes/tokyo-night-dark.css b/themes/risotto/assets/css/palettes/tokyo-night-dark.css similarity index 100% rename from themes/risotto/static/css/palettes/tokyo-night-dark.css rename to themes/risotto/assets/css/palettes/tokyo-night-dark.css diff --git a/themes/risotto/static/css/palettes/tokyo-night-light.css b/themes/risotto/assets/css/palettes/tokyo-night-light.css similarity index 100% rename from themes/risotto/static/css/palettes/tokyo-night-light.css rename to themes/risotto/assets/css/palettes/tokyo-night-light.css diff --git a/themes/risotto/static/css/palettes/windows-95-light.css b/themes/risotto/assets/css/palettes/windows-95-light.css similarity index 100% rename from themes/risotto/static/css/palettes/windows-95-light.css rename to themes/risotto/assets/css/palettes/windows-95-light.css diff --git a/themes/risotto/static/css/palettes/windows-95.css b/themes/risotto/assets/css/palettes/windows-95.css similarity index 100% rename from themes/risotto/static/css/palettes/windows-95.css rename to themes/risotto/assets/css/palettes/windows-95.css diff --git a/themes/risotto/assets/css/risotto.css b/themes/risotto/assets/css/risotto.css new file mode 100644 index 0000000..07c3acc --- /dev/null +++ b/themes/risotto/assets/css/risotto.css @@ -0,0 +1,7 @@ +/* Risotto Main Theme CSS File */ +/* Modified by Ethan Marshall - 2024 */ + +body { + background-color: var(--bg); + color: var(--fg); +} diff --git a/themes/risotto/static/css/typography.css b/themes/risotto/assets/css/typography.css similarity index 100% rename from themes/risotto/static/css/typography.css rename to themes/risotto/assets/css/typography.css diff --git a/themes/risotto/layouts/partials/about.html b/themes/risotto/layouts/partials/about.html index aa1dce3..397f8af 100644 --- a/themes/risotto/layouts/partials/about.html +++ b/themes/risotto/layouts/partials/about.html @@ -8,9 +8,32 @@ {{ end }} diff --git a/themes/risotto/layouts/partials/head.html b/themes/risotto/layouts/partials/head.html index 443c702..ac1081f 100644 --- a/themes/risotto/layouts/partials/head.html +++ b/themes/risotto/layouts/partials/head.html @@ -8,13 +8,11 @@ - - - - - + +{{ $css := resources.Match "css/*.css" | resources.Concat "out.css" }} + {{ if os.FileExists "static/favicon.ico" }}{{ end }} diff --git a/themes/risotto/static/css/risotto.css b/themes/risotto/static/css/risotto.css deleted file mode 100644 index dcb5a96..0000000 --- a/themes/risotto/static/css/risotto.css +++ /dev/null @@ -1,12 +0,0 @@ -@import 'colours.css'; -@import 'typography.css'; -@import 'layout.css'; -@import 'header.css'; -@import 'logo.css'; -@import 'about.css'; -@import 'footer.css'; - -body { - background-color: var(--bg); - color: var(--fg); -}