From 636ab5cbabe67323258bc16830a0f3c44957fc71 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Mon, 27 Mar 2023 11:35:54 +0530
Subject: [PATCH] Change the foreground color of the code mirror text for Dark
 Theme. #6018

---
 docs/en_US/release_notes_7_0.rst                             | 2 ++
 web/pgadmin/static/scss/resources/dark/_theme.variables.scss | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/en_US/release_notes_7_0.rst b/docs/en_US/release_notes_7_0.rst
index 51c6dba7a..c9097cdec 100644
--- a/docs/en_US/release_notes_7_0.rst
+++ b/docs/en_US/release_notes_7_0.rst
@@ -54,8 +54,10 @@ Bug fixes
   | `Issue #5919 <https://github.com/pgadmin-org/pgadmin4/issues/5919>`_ -  While restoring the database connections due to lost server connection, ensure that the databases which were previously connected are only reconnected.
   | `Issue #5921 <https://github.com/pgadmin-org/pgadmin4/issues/5921>`_ -  Ensure that when pasting rows the rows are added right below the selected rows for copying.
   | `Issue #5929 <https://github.com/pgadmin-org/pgadmin4/issues/5929>`_ -  Dashboard graph Y-axis width should increase with label.
+  | `Issue #5934 <https://github.com/pgadmin-org/pgadmin4/issues/5934>`_ -  Ensure that default values are set only for insert statement if user does not provide any values, in case of updating existing values to blank it should be set to null.
   | `Issue #5941 <https://github.com/pgadmin-org/pgadmin4/issues/5941>`_ -  Fixed an issue where migration on external database is not working.
   | `Issue #5943 <https://github.com/pgadmin-org/pgadmin4/issues/5943>`_ -  Use http for SVG namespace URLs which were changed to https for SonarQube fixes.
   | `Issue #5952 <https://github.com/pgadmin-org/pgadmin4/issues/5952>`_ -  Ensure that the schema diff tool should not allow comparison between Postgres Server and EDB Postgres Advanced Server.
   | `Issue #5955 <https://github.com/pgadmin-org/pgadmin4/issues/5955>`_ -  Fix an issue where query tool is stuck when running query after discarding changed data.
   | `Issue #5958 <https://github.com/pgadmin-org/pgadmin4/issues/5958>`_ -  Fix an issue where new dashboard graphs are partially following theme colors.
+  | `Issue #6018 <https://github.com/pgadmin-org/pgadmin4/issues/6018>`_ -  Change the foreground color of the code mirror text for Dark Theme.
diff --git a/web/pgadmin/static/scss/resources/dark/_theme.variables.scss b/web/pgadmin/static/scss/resources/dark/_theme.variables.scss
index ef761f096..5ab50e122 100644
--- a/web/pgadmin/static/scss/resources/dark/_theme.variables.scss
+++ b/web/pgadmin/static/scss/resources/dark/_theme.variables.scss
@@ -68,7 +68,7 @@ $table-bg: $color-gray-lighter;
 // SET sql text selection background color.
 $sql-editor-selection-bg: #536270;
 
-$color-editor-fg: #7dc9f1;
+$color-editor-fg: $white;
 $color-editor-keyword: #db7c74;
 $color-editor-number: #7fcc5c;
 $color-editor-string: #e4e487;