From a219d05566894ad31bb2a9a32794095ba5881d18 Mon Sep 17 00:00:00 2001 From: revsuine Date: Mon, 25 Nov 2024 02:04:25 +0000 Subject: [PATCH 1/6] themes/terminal: switch to my fork of the theme --- .gitmodules | 2 +- themes/terminal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e3d5e29..3cf9b07 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "themes/terminal"] path = themes/terminal - url = https://github.com/panr/hugo-theme-terminal.git + url = https://git.revsuine.xyz/revsuine/hugo-theme-terminal.git [submodule "themes/boxgruv"] path = themes/boxgruv url = https://git.revsuine.xyz/revsuine/hugo-theme-boxgruv.git diff --git a/themes/terminal b/themes/terminal index b09f47a..ae454be 160000 --- a/themes/terminal +++ b/themes/terminal @@ -1 +1 @@ -Subproject commit b09f47aae7bc7f2fdeab523d15d2a8d217c4dad1 +Subproject commit ae454bef38f19aa066aefa2892005d3e0fe28129 From 3e7cbf0d4419fe36379d4a4f99dc0ac69f1cef26 Mon Sep 17 00:00:00 2001 From: revsuine Date: Mon, 25 Nov 2024 02:18:38 +0000 Subject: [PATCH 2/6] hugo.toml: add showWordCount --- hugo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hugo.toml b/hugo.toml index c986c4e..a65398f 100644 --- a/hugo.toml +++ b/hugo.toml @@ -55,6 +55,9 @@ theme = 'terminal' # whether to show a page's estimated reading time # readingTime = false # default + # whether to show a page's word count + showWordCount = true + # whether to show a table of contents # can be overridden in a page's front-matter # Toc = false # default From 50b954fe5a9c12bbb5d3a3e69b8c23d71a331a35 Mon Sep 17 00:00:00 2001 From: revsuine Date: Mon, 25 Nov 2024 02:18:49 +0000 Subject: [PATCH 3/6] themes/terminal: update --- themes/terminal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/terminal b/themes/terminal index ae454be..2a62783 160000 --- a/themes/terminal +++ b/themes/terminal @@ -1 +1 @@ -Subproject commit ae454bef38f19aa066aefa2892005d3e0fe28129 +Subproject commit 2a6278396c423aeb3aa046c20744cfce9c74f0bd From e0a64994cac2acb766d960fdcbf45321805ca3d8 Mon Sep 17 00:00:00 2001 From: revsuine Date: Mon, 25 Nov 2024 02:28:03 +0000 Subject: [PATCH 4/6] static/style.css, static/gruvbox-material.css: move colour definitions to separate css file --- static/gruvbox-material.css | 37 +++++++++++++++++++++++++++++++++++++ static/style.css | 37 ++----------------------------------- 2 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 static/gruvbox-material.css diff --git a/static/gruvbox-material.css b/static/gruvbox-material.css new file mode 100644 index 0000000..07fcebb --- /dev/null +++ b/static/gruvbox-material.css @@ -0,0 +1,37 @@ +:root { + /* gruvbox material medium dark https://github.com/sainnhe/gruvbox-material */ + --bg_dim: #1b1b1b; + --bg0: #282828; + --bg1: #32302f; + --bg2: #32302f; + --bg3: #45403d; + --bg4: #45403d; + --bg5: #5a524c; + --bg_statusline1: #32302f; + --bg_statusline2: #313735; + --bg_statusline3: #504945; + --bg_diff_green: #34381b; + --bg_visual_green: #3b4439; + --bg_diff_red: #402120; + --bg_visual_red: #4c3432; + --bg_diff_blue: #0e363e; + --bg_visual_blue: #373131; + --bg_visual_yellow: #4f422e; + --bg_current_word: #3c3836; + --fg0: #d4be98; + --fg1: #ddc7a1; + --red: #ea6962; + --orange: #e78a4e; + --yellow: #d8a657; + --green: #a9b665; + --aqua: #89b482; + --blue: #7daea3; + --purple: #d3869b; + --bg_red: #ea6962; + --bg_green: #a9b665; + --bg_yellow: #d8a657; + --grey0: #7c6f64; + --grey1: #928374; + --grey2: #a89984; +} + diff --git a/static/style.css b/static/style.css index 5d3a254..c53e154 100644 --- a/static/style.css +++ b/static/style.css @@ -1,39 +1,6 @@ -:root { - /* gruvbox material medium dark https://github.com/sainnhe/gruvbox-material */ - --bg_dim: #1b1b1b; - --bg0: #282828; - --bg1: #32302f; - --bg2: #32302f; - --bg3: #45403d; - --bg4: #45403d; - --bg5: #5a524c; - --bg_statusline1: #32302f; - --bg_statusline2: #313735; - --bg_statusline3: #504945; - --bg_diff_green: #34381b; - --bg_visual_green: #3b4439; - --bg_diff_red: #402120; - --bg_visual_red: #4c3432; - --bg_diff_blue: #0e363e; - --bg_visual_blue: #373131; - --bg_visual_yellow: #4f422e; - --bg_current_word: #3c3836; - --fg0: #d4be98; - --fg1: #ddc7a1; - --red: #ea6962; - --orange: #e78a4e; - --yellow: #d8a657; - --green: #a9b665; - --aqua: #89b482; - --blue: #7daea3; - --purple: #d3869b; - --bg_red: #ea6962; - --bg_green: #a9b665; - --bg_yellow: #d8a657; - --grey0: #7c6f64; - --grey1: #928374; - --grey2: #a89984; +@import url("gruvbox-material.css"); +:root { --background: var(--bg0); --foreground: var(--fg0); --accent: var(--green); From d8eec50530bc7875630527043a8c2b9a511698d4 Mon Sep 17 00:00:00 2001 From: revsuine Date: Mon, 25 Nov 2024 02:38:45 +0000 Subject: [PATCH 5/6] static/style.css, static/terminal.css: code styling --- static/style.css | 9 +++++++++ static/terminal.css | 12 +++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/static/style.css b/static/style.css index c53e154..25987e1 100644 --- a/static/style.css +++ b/static/style.css @@ -5,6 +5,7 @@ --foreground: var(--fg0); --accent: var(--green); --faint_foreground: var(--grey0); + --code_background: var(--bg_dim); } /* note: grey0 is actually fg0 with 0.5 opacity over bg0, so the below footer css has no effect. however, i've decided @@ -21,3 +22,11 @@ opacity: 0.5; } +.code-toolbar { + border: 1px solid var(--bg3); +} + +code { + background: var(--code_background); +} + diff --git a/static/terminal.css b/static/terminal.css index 526d324..810ced8 100644 --- a/static/terminal.css +++ b/static/terminal.css @@ -1,7 +1,9 @@ +@import url("gruvbox-material.css"); + :root { - --background: #282828; - --foreground: #d4be98; - --accent: #a9b665; + --background: var(--bg0); + --foreground: var(--fg0); + --accent: var(--green); --font-size: 1rem; --line-height: 1.54rem; --radius: 0px; @@ -275,13 +277,13 @@ code code { pre { tab-size: 4; - background: color-mix(in srgb, var(--foreground) 5%, transparent) !important; + background: var(--bg_dim) !important; color: var(--foreground); padding: 20px 10px; font-size: 0.95rem !important; overflow: auto; border-radius: var(--radius); - border: 1px solid color-mix(in srgb, var(--foreground) 10%, transparent); + border: 1px solid var(--bg3); } pre code { From ae49705ff6cb41d9ea5015a1db34fdc531f36e01 Mon Sep 17 00:00:00 2001 From: revsuine Date: Mon, 25 Nov 2024 02:47:23 +0000 Subject: [PATCH 6/6] static/style.css: configure anchor and anchor hover styling --- static/style.css | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/static/style.css b/static/style.css index 25987e1..aab7820 100644 --- a/static/style.css +++ b/static/style.css @@ -8,6 +8,29 @@ --code_background: var(--bg_dim); } +a { + color: var(--accent); + /* actually i don't like how transitions look */ + /* transition: 0.3s; */ +} + +a:hover { + color: var(--background) !important; + background-color: var(--accent) !important; +} + +.code-toolbar { + border: 1px solid var(--bg3); +} + +code { + background: var(--code_background); +} + +.footnotes { + color: var(--faint_foreground); +} + /* note: grey0 is actually fg0 with 0.5 opacity over bg0, so the below footer css has no effect. however, i've decided * to write it this way because i prefer to not use opacity to create colours when possible, instead setting * full-opacity explicit/unmodified colours. opacity is still used to create the dimmer hr in the footer. @@ -22,11 +45,3 @@ opacity: 0.5; } -.code-toolbar { - border: 1px solid var(--bg3); -} - -code { - background: var(--code_background); -} -