Added High Contrast theme support. Fixes #5653

Fixed text color issue in explain analyze for the Dark theme. Fixes #5677
This commit is contained in:
Nikhil Mohite
2020-07-20 11:51:21 +05:30
committed by Akshay Joshi
parent 9174db2024
commit 7edcca9b07
52 changed files with 586 additions and 145 deletions

View File

@@ -38,21 +38,21 @@ define('misc.bgprocess', [
<div class="pr-2">
<i class="fa fa-check fa-lg text-success pg-bg-status-icon" aria-hidden="true" role="img"></i>
</div>
<div class="text-body mx-auto pg-bg-status-text"><%-status_text%></div>
<div class="mx-auto pg-bg-status-text alert-text-body"><%-status_text%></div>
</div>`),
failed_status_tpl: _.template(`
<div class="d-flex px-2 py-1 bg-danger-lighter border border-danger rounded">
<div class="pr-2">
<i class="fa fa-close fa-lg text-danger pg-bg-status-icon" aria-hidden="true" role="img"></i>
</div>
<div class="text-body mx-auto pg-bg-status-text"><%-status_text%></div>
<div class="mx-auto pg-bg-status-text alert-text-body"><%-status_text%></div>
</div>`),
other_status_tpl: _.template(`
<div class="d-flex px-2 py-1 bg-primary-light border border-primary rounded">
<div class="pr-2">
<i class="fa fa-info fa-lg text-primary pg-bg-status-icon" aria-hidden="true" role="img"></i>
</div>
<div class="text-body mx-auto pg-bg-status-text"><%-status_text%></div>
<div class="mx-auto pg-bg-status-text alert-text-body"><%-status_text%></div>
</div>`),
initialize: function(info, notify) {
_.extend(this, {

View File

@@ -1542,7 +1542,7 @@ define([
// we remove simple file upload element
$('.file-input-container').remove();
$('.upload').remove();
$('.create').before('<button value="Upload" type="button" title="Upload File" name="upload" id="upload" class="btn btn-sm btn-secondary upload" tabindex="0"><span class="fa fa-upload sql-icon-lg"></span></button> ');
$('.create').before('<button value="Upload" type="button" title="Upload File" name="upload" id="upload" class="btn btn-sm btn-primary-icon upload" tabindex="0"><span class="fa fa-upload sql-icon-lg"></span></button> ');
$('#uploader .upload').off().on('click', function() {
// we create prompt

View File

@@ -53,7 +53,8 @@
.file_listing #contents.grid li.selected {
cursor: pointer;
border: $table-hover-border;
background: $table-hover-bg-color;
background: $grid-hover-bg-color;
color: $grid-hover-fg-color;
}
.fileinfo #contents li span.less_text {
@@ -317,6 +318,16 @@
cursor: pointer;
}
.cap_select_file:hover {
color: $grid-hover-fg-color !important;
.fm_folder_list,
.fm_folder_grid,
.fm_file_grid,
.fm_file_list {
color: $grid-hover-fg-color !important;
}
}
.add-folder-icon {
position: relative;
top: -8px;

View File

@@ -8,11 +8,11 @@
<div class="flex-grow-1 mr-1">
<div class="input-group" role="group">
<div class="input-group-prepend">
<button name="home" type="button" value="Home" title="{{ _('Home') }}" class="btn btn-secondary home"
<button name="home" type="button" value="Home" title="{{ _('Home') }}" class="btn btn-primary-icon home"
tabindex="0">
<span class="fa fa-home sql-icon-lg"></span>
</button>
<button name="level-up" type="button" title="{{ _('Back') }}" value="LevelUp" class="btn btn-secondary level-up"
<button name="level-up" type="button" title="{{ _('Back') }}" value="LevelUp" class="btn btn-primary-icon level-up"
disabled tabindex="0">
<span class="fa fa-level-up sql-icon-lg"></span>
</button>
@@ -24,32 +24,32 @@
<div>
<input class="mode" name="mode" type="hidden" value="add"/>
<input class="currentpath" name="currentpath" type="hidden"/>
<button type="button" title="{{ _('Refresh') }}" class="btn btn-sm btn-secondary refresh"
<button type="button" title="{{ _('Refresh') }}" class="btn btn-sm btn-primary-icon refresh"
tabindex="0">
<span class="fa fa-refresh sql-icon-lg"></span>
</button>
<button type="button" title="{{ _('Download File') }}" class="btn btn-sm btn-secondary download"
<button type="button" title="{{ _('Download File') }}" class="btn btn-sm btn-primary-icon download"
disabled>
<span class="fa fa-download sql-icon-lg"></span>
</button>
<button name="delete" type="button" title="{{ _('Delete File/Folder') }}" class="btn btn-sm btn-secondary delete"
<button name="delete" type="button" title="{{ _('Delete File/Folder') }}" class="btn btn-sm btn-primary-icon delete"
disabled>
<span class="fa fa-trash sql-icon-lg"></span>
</button>
<button name="rename" type="button" title="{{ _('Rename File/Folder') }}" class="btn btn-sm btn-secondary rename"
<button name="rename" type="button" title="{{ _('Rename File/Folder') }}" class="btn btn-sm btn-primary-icon rename"
tabindex="0">
<span class="fa fa-pencil-square-o sql-icon-lg"></span>
</button>
<button name="newfolder" type="button" title="{{ _('Create new folder') }}" value="New Folder"
class="btn btn-sm btn-secondary create" tabindex="0">
class="btn btn-sm btn-primary-icon create" tabindex="0">
<span class="fa fa-folder-open sql-icon-lg"></span>
<span class="fa fa-plus add-folder-icon"></span>
</button>
<div class="btn-group" role="group">
<button class="ON btn btn-secondary btn-sm grid" type="button" title="{{ _('View as grid') }}" tabindex="0">
<button class="ON btn btn-primary-icon btn-sm grid" type="button" title="{{ _('View as grid') }}" tabindex="0">
<span class="fa fa-th sql-icon-lg"></span>
</button>
<button type="button" class="btn btn-secondary btn-sm list" title="{{ _('View as table') }}" tabindex="0">
<button type="button" class="btn btn-primary-icon btn-sm list" title="{{ _('View as table') }}" tabindex="0">
<span class="fa fa-list sql-icon-lg"></span>
</button>
</div>
@@ -67,14 +67,14 @@
<div class='delete_item'>
<span>{{ _('Are you sure you want to delete this item?') }}</span>
<span class="pull-right">
<button type='button' class='btn btn-secondary btn_no' tabindex="0">{{ _('No') }}</button>
<button type='button' class='btn btn-primary-icon btn_no' tabindex="0">{{ _('No') }}</button>
<button type='button' class='btn btn-primary btn_yes' tabindex="0">{{ _('Yes') }}</button>
</span>
</div>
<div class='replace_file'>
<span>{{ _('Are you sure you want to replace this file?') }}</span>
<span class="pull-right">
<button type='button' class='btn btn-secondary btn_no' tabindex="0">{{ _('No') }}</button>
<button type='button' class='btn btn-primary-icon btn_no' tabindex="0">{{ _('No') }}</button>
<button type='button' class='btn btn-primary btn_yes' tabindex="0">{{ _('Yes') }}</button>
</span>
</div>

View File

@@ -1285,7 +1285,7 @@ define('pgadmin.misc.explain', [
role: 'group',
}).appendTo(graphicalContainer),
zoomInBtn = $('<button></button>', {
class: 'btn btn-secondary pg-explain-zoom-btn',
class: 'btn btn-primary-icon pg-explain-zoom-btn',
title: gettext('Zoom in'),
'aria-label': gettext('Zoom in'),
tabindex: 0,
@@ -1294,7 +1294,7 @@ define('pgadmin.misc.explain', [
class: 'fa fa-search-plus',
})),
zoomToNormal = $('<button></button>', {
class: 'btn btn-secondary pg-explain-zoom-btn',
class: 'btn btn-primary-icon pg-explain-zoom-btn',
title: gettext('Zoom to original'),
'aria-label': gettext('Zoom to original'),
tabindex: 0,
@@ -1303,7 +1303,7 @@ define('pgadmin.misc.explain', [
class: 'fa fa-arrows-alt',
})),
zoomOutBtn = $('<button></button>', {
class: 'btn btn-secondary pg-explain-zoom-btn',
class: 'btn btn-primary-icon pg-explain-zoom-btn',
title: gettext('Zoom out'),
'aria-label': gettext('Zoom out'),
tabindex: 0,
@@ -1318,7 +1318,7 @@ define('pgadmin.misc.explain', [
}).appendTo(graphicalContainer),
downloadBtn = $('<button></button>', {
id: 'btn-explain-download',
class: 'btn btn-secondary pg-explain-download-btn',
class: 'btn btn-primary-icon pg-explain-download-btn',
title: gettext('Download'),
'aria-label': gettext('Download'),
tabindex: 0,
@@ -1347,7 +1347,7 @@ define('pgadmin.misc.explain', [
$('<button></button>', {
id: 'btn-explain-stats',
class: 'btn btn-secondary pg-explain-stats-btn',
class: 'btn btn-primary-icon pg-explain-stats-btn',
title: gettext('Statistics'),
'aria-label': gettext('Statistics'),
tabindex: 0,

View File

@@ -49,6 +49,7 @@ 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,