From ff1744cbbc27c9dd584817122a22dd51d04f90e6 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sat, 6 Apr 2024 23:06:27 +0200
Subject: [PATCH] [PORT] gitea#30282: Markup color and font size fixes

1. Distinguish inline an block code with new CSS variable
`--color-markup-code-inline`
2. Various color tweaks, better contrast from background

(cherry picked from commit 662eb4b0852f9ce2c161e7fea5ac66bf912fc9f6)

---

- Revert the changes of #2874.
- Add more contrast to the inline block for light and dark theme.

(cherry picked from commit 662eb4b0852f9ce2c161e7fea5ac66bf912fc9f6)
---
 web_src/css/markup/content.css             | 4 ++--
 web_src/css/themes/theme-forgejo-dark.css  | 3 ++-
 web_src/css/themes/theme-forgejo-light.css | 1 +
 web_src/css/themes/theme-gitea-dark.css    | 5 +++--
 web_src/css/themes/theme-gitea-light.css   | 5 +++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css
index 430b4802d6..419868a461 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);
 }
 
@@ -509,7 +509,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-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css
index e8744f32ef..862aaf4ba4 100644
--- a/web_src/css/themes/theme-forgejo-dark.css
+++ b/web_src/css/themes/theme-forgejo-dark.css
@@ -205,7 +205,8 @@
   --color-menu: var(--steel-700);
   --color-card: var(--steel-700);
   --color-markup-table-row: #ffffff06;
-  --color-markup-code-block: var(--steel-850);
+  --color-markup-code-block: var(--steel-800);
+  --color-markup-code-inline: var(--steel-850);
   --color-button: var(--steel-600);
   --color-code-bg: var(--steel-750);
   --color-shadow: #00000060;
diff --git a/web_src/css/themes/theme-forgejo-light.css b/web_src/css/themes/theme-forgejo-light.css
index 858f61b95a..7e3aa69344 100644
--- a/web_src/css/themes/theme-forgejo-light.css
+++ b/web_src/css/themes/theme-forgejo-light.css
@@ -224,6 +224,7 @@
   --color-card: var(--zinc-50);
   --color-markup-table-row: #ffffff06;
   --color-markup-code-block: var(--zinc-150);
+  --color-markup-code-inline: var(--zinc-200);
   --color-button: var(--zinc-150);
   --color-code-bg: var(--zinc-50);
   --color-shadow: #00000060;
diff --git a/web_src/css/themes/theme-gitea-dark.css b/web_src/css/themes/theme-gitea-dark.css
index 626590ca54..07e217742d 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 f6913fbe22..2741e0e0bd 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: #0030600a;
+  --color-markup-code-block: #00306010;
+  --color-markup-code-inline: #00306012;
   --color-button: #f8f9fb;
   --color-code-bg: #fafdff;
   --color-shadow: #00001726;