From 63a88758e1929f628f7f9013a4cd91cdb7adec90 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 5 Apr 2024 00:51:14 +0200 Subject: [PATCH 1/4] Markup color and font size fixes --- web_src/css/markup/content.css | 13 +++++++++++-- web_src/css/themes/theme-gitea-dark.css | 5 +++-- web_src/css/themes/theme-gitea-light.css | 5 +++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css index 376d3030c7351..5c2968158aa26 100644 --- a/web_src/css/markup/content.css +++ b/web_src/css/markup/content.css @@ -438,7 +438,7 @@ margin: 0; font-size: 85%; white-space: break-spaces; - background-color: var(--color-markup-code-block); + background-color: var(--color-markup-code-inline); border-radius: var(--border-radius); } @@ -475,6 +475,11 @@ border-radius: var(--border-radius); } +.markup .highlight pre > code, +.markup pre > code { + background: none !important; +} + .markup .highlight pre { margin-bottom: 0; word-break: normal; @@ -494,6 +499,10 @@ border: 0; } +.markup pre code { + font-size: 100% !important; +} + .markup pre code::before, .markup pre code::after, .markup pre tt::before, @@ -508,7 +517,7 @@ line-height: 10px; color: var(--color-text-light); vertical-align: middle; - background-color: var(--color-markup-code-block); + background-color: var(--color-markup-code-inline); border: 1px solid var(--color-secondary); border-radius: var(--border-radius); box-shadow: inset 0 -1px 0 var(--color-secondary); diff --git a/web_src/css/themes/theme-gitea-dark.css b/web_src/css/themes/theme-gitea-dark.css index 626590ca5447b..07e217742d1fc 100644 --- a/web_src/css/themes/theme-gitea-dark.css +++ b/web_src/css/themes/theme-gitea-dark.css @@ -204,8 +204,9 @@ --color-active: #e8e8ff24; --color-menu: #151a1e; --color-card: #151a1e; - --color-markup-table-row: #e8e8ff06; - --color-markup-code-block: #e8e8ff16; + --color-markup-table-row: #e8e8ff0f; + --color-markup-code-block: #e8e8ff12; + --color-markup-code-inline: #e8e8ff28; --color-button: #151a1e; --color-code-bg: #14171a; --color-shadow: #00001758; diff --git a/web_src/css/themes/theme-gitea-light.css b/web_src/css/themes/theme-gitea-light.css index f6913fbe22af4..7f57d680fd855 100644 --- a/web_src/css/themes/theme-gitea-light.css +++ b/web_src/css/themes/theme-gitea-light.css @@ -204,8 +204,9 @@ --color-active: #00001714; --color-menu: #f8f9fb; --color-card: #f8f9fb; - --color-markup-table-row: #00001708; - --color-markup-code-block: #00001710; + --color-markup-table-row: #0030600b; + --color-markup-code-block: #0030600b; + --color-markup-code-inline: #00306010; --color-button: #f8f9fb; --color-code-bg: #fafdff; --color-shadow: #00001726; From 5a94c7f5af5497e0c9be113429f131840329e429 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 6 Apr 2024 20:12:52 +0200 Subject: [PATCH 2/4] remove now-unnecssary rule --- web_src/css/markup/content.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css index 2151256955970..aec0add69e83e 100644 --- a/web_src/css/markup/content.css +++ b/web_src/css/markup/content.css @@ -475,11 +475,6 @@ border-radius: var(--border-radius); } -.markup .highlight pre > code, -.markup pre > code { - background: none !important; -} - .markup .highlight pre { margin-bottom: 0; word-break: normal; From 0594bd3451e548e0357ee7c2614af3af28284204 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 6 Apr 2024 20:17:07 +0200 Subject: [PATCH 3/4] light theme tweaks --- web_src/css/themes/theme-gitea-light.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web_src/css/themes/theme-gitea-light.css b/web_src/css/themes/theme-gitea-light.css index 7f57d680fd855..2741e0e0bd0a2 100644 --- a/web_src/css/themes/theme-gitea-light.css +++ b/web_src/css/themes/theme-gitea-light.css @@ -204,9 +204,9 @@ --color-active: #00001714; --color-menu: #f8f9fb; --color-card: #f8f9fb; - --color-markup-table-row: #0030600b; - --color-markup-code-block: #0030600b; - --color-markup-code-inline: #00306010; + --color-markup-table-row: #0030600a; + --color-markup-code-block: #00306010; + --color-markup-code-inline: #00306012; --color-button: #f8f9fb; --color-code-bg: #fafdff; --color-shadow: #00001726; From 7b9460d4ec9e50181576e40b7922fa8088cc8779 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 6 Apr 2024 20:18:43 +0200 Subject: [PATCH 4/4] remove another now-unneccessary rule --- web_src/css/markup/content.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css index aec0add69e83e..6ba4e40072670 100644 --- a/web_src/css/markup/content.css +++ b/web_src/css/markup/content.css @@ -494,10 +494,6 @@ border: 0; } -.markup pre code { - font-size: 100% !important; -} - .markup pre code::before, .markup pre code::after, .markup pre tt::before,