From 41ee58e79a1cb5bc246ad1ecb40d74bac6c3ab16 Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Fri, 4 Oct 2019 13:55:00 +0530 Subject: [PATCH] Highlighted the color of closing or opening parenthesis when user select them in CodeMirror. Fixes #4728 --- docs/en_US/release_notes_4_14.rst | 1 + web/pgadmin/static/scss/_codemirror.overrides.scss | 4 ++-- web/pgadmin/static/scss/resources/_default.variables.scss | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/en_US/release_notes_4_14.rst b/docs/en_US/release_notes_4_14.rst index fc4a7ece0..9004eedeb 100644 --- a/docs/en_US/release_notes_4_14.rst +++ b/docs/en_US/release_notes_4_14.rst @@ -21,6 +21,7 @@ Bug fixes ********* | `Issue #4199 `_ - Ensure that 'ENTER' key in the data filter should not run the query. +| `Issue #4728 `_ - Highlighted the color of closing or opening parenthesis when user select them in CodeMirror. | `Issue #4751 `_ - Fix issue where export job fails when deselecting all the columns. | `Issue #4755 `_ - Ensure that pgAdmin should work behind reverse proxy if the inbuilt server is used as it is. | `Issue #4756 `_ - Fix issue where pgAdmin does not load completely if loaded in an iframe. diff --git a/web/pgadmin/static/scss/_codemirror.overrides.scss b/web/pgadmin/static/scss/_codemirror.overrides.scss index a6775246c..1d5d689ba 100644 --- a/web/pgadmin/static/scss/_codemirror.overrides.scss +++ b/web/pgadmin/static/scss/_codemirror.overrides.scss @@ -3,8 +3,8 @@ } /* To override inbuilt Green color for matchingbracket */ .cm-s-default .CodeMirror-matchingbracket { - color: $color-gray-dark !important; - background-color: $color-gray-lighter !important; + color: $sql-bracket-match-fg !important; + background-color: $sql-bracket-match-bg !important; } .CodeMirror { diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss index 09aaf8ae2..55507a33d 100644 --- a/web/pgadmin/static/scss/resources/_default.variables.scss +++ b/web/pgadmin/static/scss/resources/_default.variables.scss @@ -197,6 +197,8 @@ $sql-history-error-fg: $color-danger; $sql-hint-bg: $color-bg-theme; $sql-hint-active-bg: $color-primary; $sql-hint-active-fg: $white; +$sql-bracket-match-fg: $color-gray-darker; +$sql-bracket-match-bg: #f5d2af; $negative-bg: $color-gray-light; $dialog-box-shadow: $box-shadow;