From 5f619ae40ac377beec964f4398cc4f5dad58e7d4 Mon Sep 17 00:00:00 2001
From: Nikhil Mohite <nikhil.mohite@enterprisedb.com>
Date: Tue, 21 Jul 2020 18:54:06 +0530
Subject: [PATCH] Ensure that data output color is readable on row selection.
 Fixes #5687

---
 .../static/scss/_bootstrap.overrides.scss      | 18 ++++++++++++++----
 .../scss/resources/_default.variables.scss     |  2 +-
 .../scss/resources/dark/_theme.variables.scss  |  2 ++
 .../sqleditor/static/scss/_sqleditor.scss      |  1 -
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/web/pgadmin/static/scss/_bootstrap.overrides.scss b/web/pgadmin/static/scss/_bootstrap.overrides.scss
index bb1a0cc58..f4b8eedfa 100644
--- a/web/pgadmin/static/scss/_bootstrap.overrides.scss
+++ b/web/pgadmin/static/scss/_bootstrap.overrides.scss
@@ -118,17 +118,19 @@ legend {
  .btn-ternary {
     @include button-variant($color-ternary, $color-fg);
     border-color: $color-ternary;
+
+
  }
 
 .btn-ternary[disabled] {
-  background-color: $btn-ternary-disabled-bg !important;
+  background-color: $btn-ternary-disabled-bg;
   color: $btn-ternary-disabled-fg !important;
-  border-color: btn-ternary-disabled-border-color !important;
+  border-color: $btn-ternary-disabled-border-color;
 
   label {
-    background-color: $btn-ternary-disabled-bg !important;
+    background-color: $btn-ternary-disabled-bg;
     color: $btn-ternary-disabled-fg !important;
-    border-color: btn-ternary-disabled-border-color !important;
+    border-color: $btn-ternary-disabled-border-color;
   }
 
 }
@@ -418,3 +420,11 @@ td.switch-cell > div.toggle {
 td.pga-ex-exclusive-2, td.pga-ex-inclusive-2 {
   color: color-yiq($explain-sev-2-bg);
 }
+
+#datagrid .slick-header .slick-header-column.selected {
+  color: color-yiq($color-primary)
+}
+
+.editor-text {
+  color: color-yiq($color-bg);
+}
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index df115e7fe..2043b8098 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -219,7 +219,7 @@ $table-hover-border-color: $color-primary;
 $table-hover-border: $panel-border-width solid $color-primary !important;
 $table-hover-bg-color: $color-primary-light !default;
 $datagrid-bg: $color-gray-light !default;
-$datagrid-selected-color : $color-primary-fg !default;
+$datagrid-selected-color: $color-fg !default;
 
 $tree-text-fg: $color-fg !default;
 $tree-text-hover-fg: $color-fg !default;
diff --git a/web/pgadmin/static/scss/resources/dark/_theme.variables.scss b/web/pgadmin/static/scss/resources/dark/_theme.variables.scss
index c7d82458c..a033cbfe4 100644
--- a/web/pgadmin/static/scss/resources/dark/_theme.variables.scss
+++ b/web/pgadmin/static/scss/resources/dark/_theme.variables.scss
@@ -113,3 +113,5 @@ $btn-primary-icon-disable-bg: $color-secondary;
 
 $btn-ternary-disabled-fg: $color-fg;
 $color-success-hover-fg: $color-fg;
+
+$datagrid-selected-color: $color-primary-fg;
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
index 655650888..744d3b740 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
@@ -149,7 +149,6 @@ li.CodeMirror-hint-active {
 
 #datagrid .slick-header .slick-header-column.selected {
   background-color: $color-primary;
-  color: $datagrid-selected-color;
 }
 .slick-row .slick-cell {
   border-bottom: $panel-border;