From 00eb47384aaacb63795bde73f3a13cced983aec2 Mon Sep 17 00:00:00 2001
From: StyleZhang <jasonapring2015@outlook.com>
Date: Tue, 26 Nov 2024 10:31:39 +0800
Subject: [PATCH] merge main

---
 web/themes/dark.css        | 8 --------
 web/themes/manual-dark.css | 3 ---
 2 files changed, 11 deletions(-)

diff --git a/web/themes/dark.css b/web/themes/dark.css
index 261e4db4cd..f0a7b521c6 100644
--- a/web/themes/dark.css
+++ b/web/themes/dark.css
@@ -336,11 +336,7 @@ html[data-theme="dark"] {
   --color-text-logo-text: #E9E9EC;
   --color-text-empty-state-icon: #C8CEDA4D;
   --color-text-inverted: #FFFFFF;
-<<<<<<< HEAD
-  --color-text-inverted-dimm: #FFFFFFCC;
-=======
   --color-text-inverted-dimmed: #FFFFFFCC;
->>>>>>> main
 
   --color-background-body: #1D1D20;
   --color-background-default-subtle: #222225;
@@ -694,7 +690,6 @@ html[data-theme="dark"] {
 
   --color-third-party-LangChain: #FFFFFF;
   --color-third-party-Langfuse: #FFFFFF;
-<<<<<<< HEAD
 
   --color-third-party-Github: #FFFFFF;
   --color-third-party-Github-tertiary: #C8CEDA99;
@@ -702,7 +697,4 @@ html[data-theme="dark"] {
   --color-third-party-model-bg-openai: #121212;
   --color-third-party-model-bg-anthropic: #1D1917;
   --color-third-party-model-bg-default: #0B0B0E;
-=======
-  --color-third-party-Github: #FFFFFF;
->>>>>>> main
 }
\ No newline at end of file
diff --git a/web/themes/manual-dark.css b/web/themes/manual-dark.css
index c518cab72f..4e48cdbb16 100644
--- a/web/themes/manual-dark.css
+++ b/web/themes/manual-dark.css
@@ -2,9 +2,6 @@ html[data-theme="dark"] {
   --color-chatbot-bg: linear-gradient(180deg, rgba(34, 34, 37, 0.90) 0%, rgba(29, 29, 32, 0.90) 90.48%);
   --color-chat-bubble-bg: linear-gradient(180deg, rgba(200, 206, 218, 0.08) 0%, rgba(200, 206, 218, 0.02) 100%);
   --color-workflow-process-bg: linear-gradient(90deg, rgba(24, 24, 27, 0.25) 0%, rgba(24, 24, 27, 0.04) 100%);
-<<<<<<< HEAD
   --color-marketplace-divider-bg: linear-gradient(90deg, rgba(200, 206, 218, 0.14) 0%, rgba(0, 0, 0, 0) 100%);
   --color-marketplace-plugin-empty: linear-gradient(180deg, rgba(0, 0, 0, 0.00) 0%, #222225 100%);
-=======
->>>>>>> main
 }
\ No newline at end of file