IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-09 23:54:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the following issues for High Contrast Theme:

Browse Source 
1) Schema diff compare button icon is not visible on hover.
  2) Schema diff for identical section text is not readable due to the same color as the background.
  3) Removed extra variables used for set text color for explain - Analysis section (Issue related dark theme.). 
  4) Issue related to the disabled toggle button.

refs #5653
This commit is contained in:
Nikhil Mohite 2020-07-20 15:12:46 +05:30 committed by Akshay Joshi
parent f29db1a9cd
commit 3983e2c13c
8 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/pgadmin/misc/static/explain/scss/_explain.scss
View File

@ -49,7 +49,6 @@ div.tab-pane[data-explain-tabpanel=table] {
td.pga-ex-inclusive-2,
td.pga-ex-rowsx-2 {
background-color: $explain-sev-2-bg;
color: $explain-sev-2-color;
}
td.pga-ex-exclusive-3,

8
web/pgadmin/static/scss/_bootstrap.overrides.scss
View File

@ -167,12 +167,12 @@ legend {
.btn-success[disabled] {
background-color: $color-success-disabled-bg !important;
border-color: $color-success-disabled-bg !important;
border-color: $color-success-disabled-border-color !important;
color: $color-success-disabled-fg !important;
label {
background-color: $color-success-disabled-bg !important;
border-color: $color-success-disabled-bg !important;
border-color: $color-success-disabled-border-color !important;
color: $color-success-disabled-fg !important;
}
}
@ -414,3 +414,7 @@ td.switch-cell > div.toggle {
overflow-y: auto;
}
}
td.pga-ex-exclusive-2, td.pga-ex-inclusive-2 {
color: color-yiq($explain-sev-2-bg);
}

2
web/pgadmin/static/scss/resources/_default.variables.scss
View File

@ -29,6 +29,7 @@ $color-success-light: #D9ECDA !default;
$color-success-disabled-fg: $color-bg !default;
$color-success-disabled-bg: $color-success !default;
$color-success-disabled-border-color: $color-success !default;
$color-success-hover-fg: $white !default;
$color-warning: #eea236 !default;
@ -257,7 +258,6 @@ $explain-sev-3-bg: #EE8800 !default;
$explain-sev-4-bg: #880000 !default;
$explain-sev-3-color: #FFFFFF !default;
$explain-sev-4-color: #FFFFFF !default;
$explain-sev-2-color: $black !default;
$dialog-box-shadow: 0 0.5rem 3rem $shadow-base-color;

1
web/pgadmin/static/scss/resources/dark/_theme.variables.scss
View File

@ -81,7 +81,6 @@ $explain-sev-3-bg: #c2812b;
$explain-sev-4-bg: #880000;
$explain-sev-3-color: $color-fg;
$explain-sev-4-color: $color-fg;
$explain-sev-2-color: $black;
$negative-bg: $color-bg;

2
web/pgadmin/static/scss/resources/high_contrast/_theme.variables.scss
View File

@ -23,6 +23,7 @@ $color-success-light: #45D48A;
$color-success-disabled-fg: $color-fg;
$color-success-disabled-bg: $color-bg;
$color-success-disabled-border-color: $color-fg;
$color-success-hover-fg: #010B15;
$color-warning: #F4D35E;
@ -104,7 +105,6 @@ $explain-sev-3-bg: #FFAD65;
$explain-sev-4-bg: #EE7A55;
$explain-sev-3-color: #010B15;
$explain-sev-4-color: #010B15;
$explain-sev-2-color: #010B15;
$btn-ternary-border: $color-ternary;
$btn-ternary-hover-bg: #a6b7c8;

21
web/pgadmin/tools/schema_diff/static/css/schema_diff.css
View File

@ -4,17 +4,16 @@
}
.icon-schema-diff-white {
display: inline-block;
align-content: center;
vertical-align: middle;
height: 18px;
width: 18px;
background-size: 20px !important;
background-repeat: no-repeat;
background-position-x: center;
background-position-y: center;
background-image: url('../img/compare-white.svg') !important;
}
display: inline-block;
align-content: center;
vertical-align: sub;
height: 18px;
width: 18px;
background-size: 20px !important;
background-repeat: no-repeat;
background-position-x: center;
background-position-y: center;
}
.icon-script {
display: inline-block;

2
web/pgadmin/tools/schema_diff/static/js/schema_diff.backform.js
View File

@ -317,7 +317,7 @@ let SchemaDiffHeaderView = Backform.Form.extend({
<div class="col-6 target row"></div>
<div class="col-5 target-buttons">
<div class="action-btns d-flex">
<button class="btn btn-primary mr-auto"><i class="icon-schema-diff-white"></i>&nbsp;` + gettext('Compare') + `</button>
<button class="btn btn-primary mr-auto"><span class="icon-schema-diff icon-schema-diff-white"></span>&nbsp;` + gettext('Compare') + `</button>
<button id="generate-script" class="btn btn-primary-icon mr-1" disabled><i class="fa fa-file-code-o sql-icon-lg"></i>&nbsp;` + gettext('Generate Script') + `</button>
<div class="btn-group mr-1" role="group" aria-label="">
<button id="btn-filter" type="button" class="btn btn-primary-icon"

6
web/pgadmin/tools/schema_diff/static/scss/_schema_diff.scss
View File

@ -24,7 +24,7 @@
font-size: $tree-font-size;
.ui-widget-content {
background-color: $input-bg;
color: $schema-diff-color-fg;
color: $input-color;
}
.ui-state-default {
@ -67,16 +67,20 @@
#schema-diff-grid .different {
background-color: $schemadiff-diff-row-color !important;
color: $schema-diff-color-fg;
}
#schema-diff-grid .source {
background-color: $schemadiff-source-row-color;
color: $schema-diff-color-fg;
}
#schema-diff-grid .target {
background-color: $schemadiff-target-row-color !important;
color: $schema-diff-color-fg;
}
#schema-diff-grid .slick-row.active {
background-color: $table-bg-selected !important;
color: $schema-diff-color-fg;
}
#schema-diff-ddl-comp {