From 86ecf9c84ec4c36e6802ccd99b011057fc3e5f82 Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Wed, 2 Jan 2019 15:05:15 +0530 Subject: [PATCH] Fixed following: - Base font size changed from 0.815rem to 0.875rem, for navbar from 0.875rem to 0.925rem. - Dialog sizes made consistent throughout the application. Now there are 3 size options for width and height each - sm, md, lg. Combination of any of these to be used hereafter - Alignment fix for controls of Node properties dialogs which includes showing text and label in one line without dialog size change, checkbox alignment, switch control alignment at places and other minor improvements in other dialogs - Error message design change in dialogs validation - SQL Editor data grid editor popup design changes which were missed - Design change for dashboard server activity grid - Login page language dropdown color fix - Properties accordion collapse design fix - Help, Info icon fixed across all dialogs which were not working if clicked exactly on the text - Added missing icon with buttons at few places - Shadow behind the dialogs is increased to make it look clearly separated and depth. - Control Alignment fix in maintenance dialog - Min height of alertify dialogs set for better UX - File dialog design fix when no files found - Grant wizard fixes - Scroll bar visibility on first page, use full space for SQL generated on the last page - Browser toolbar buttons changed to sync with SQL editor toolbar buttons - Rounded corners for docker floating dialog (no properties) - Renaming file in file dialog should show original file name - SQL data grid text edit popup buttons behaviour was swapped. This is fixed. - Import/Export dialog changes as per new design. --- web/pgadmin/about/static/js/about.js | 5 +- .../databases/languages/static/js/language.js | 4 +- .../databases/schemas/static/js/schema.js | 6 +- .../schemas/tables/indexes/static/js/index.js | 1 - .../schemas/tables/static/js/table.js | 2 +- .../schedules/static/js/pga_schedule.js | 23 ++++-- .../servers/roles/static/js/role.js | 13 ++-- .../servers/static/css/servers.css | 2 +- .../tablespaces/static/js/tablespace.js | 2 +- .../server_groups/static/js/server_group.js | 4 +- web/pgadmin/browser/static/css/wizard.css | 19 ----- web/pgadmin/browser/static/js/browser.js | 13 ++++ web/pgadmin/browser/static/js/node.js | 70 ++++++++++++----- web/pgadmin/browser/static/js/panel.js | 4 +- web/pgadmin/browser/static/js/toolbar.js | 3 + web/pgadmin/browser/static/js/wizard.js | 35 ++++----- web/pgadmin/browser/static/scss/_browser.scss | 5 ++ .../bgprocess/static/scss/_bgprocess.scss | 2 +- .../file_manager/static/css/file_manager.css | 4 +- .../file_manager/static/js/file_manager.js | 4 +- .../misc/file_manager/static/js/utility.js | 25 +++--- .../static/scss/_file_manager.scss | 24 ++---- .../templates/file_manager/index.html | 12 +-- .../misc/static/explain/css/explain.css | 11 +-- .../preferences/static/js/preferences.js | 8 +- .../preferences/static/scss/_preferences.scss | 19 ++--- .../static/js/alertify.pgadmin.defaults.js | 4 +- web/pgadmin/static/js/backform.pgadmin.js | 2 +- web/pgadmin/static/js/slickgrid/editors.js | 17 ++-- .../static/js/sqleditor/filter_dialog.js | 26 +++---- .../js/sqleditor/query_tool_notifications.js | 5 +- .../static/scss/_aci_tree.overrides.scss | 2 +- web/pgadmin/static/scss/_alert.scss | 14 +--- .../static/scss/_alertify.overrides.scss | 19 +++-- .../static/scss/_backform.overrides.scss | 16 ++-- .../static/scss/_backgrid.overrides.scss | 5 ++ .../static/scss/_bootstrap.overrides.scss | 27 ++++++- web/pgadmin/static/scss/_pgadmin.style.scss | 77 +++++++++++-------- .../static/scss/_select2.overrides.scss | 18 ++--- .../static/scss/_webcabin.pgadmin.scss | 64 ++++++++++++++- .../static/scss/resources/_default.style.scss | 8 ++ .../scss/resources/_default.variables.scss | 32 +++++--- .../static/vendor/backform/backform.js | 3 +- .../static/vendor/backgrid/backgrid.css | 4 - web/pgadmin/templates/security/fields.html | 2 +- .../templates/security/login_user.html | 4 +- web/pgadmin/tools/backup/static/js/backup.js | 8 +- .../tools/backup/static/js/backup_dialog.js | 4 +- .../tools/datagrid/static/js/datagrid.js | 2 +- .../tools/debugger/static/js/debugger_ui.js | 2 +- .../grant_wizard/static/js/grant_wizard.js | 3 +- .../static/scss/_grant_wizard.scss | 9 +-- .../import_export/static/js/import_export.js | 8 +- .../maintenance/static/js/maintenance.js | 5 +- .../tools/restore/static/js/restore.js | 4 +- .../tools/restore/static/js/restore_dialog.js | 5 +- .../tools/sqleditor/static/css/sqleditor.css | 4 +- .../tools/sqleditor/static/js/sqleditor.js | 2 +- .../sqleditor/static/scss/_sqleditor.scss | 9 +-- .../static/js/user_management.js | 31 ++++---- .../static/scss/_user_management.scss | 21 +---- .../javascript/backup/backup_dialog_spec.js | 16 +++- .../global_server_backup_dialog_spec.js | 20 ++++- .../file_manager/file_manager_specs.js | 15 ++++ .../javascript/restore/restore_dialog_spec.js | 16 +++- 65 files changed, 512 insertions(+), 341 deletions(-) diff --git a/web/pgadmin/about/static/js/about.js b/web/pgadmin/about/static/js/about.js index 1e72c917f..2aaf98f46 100644 --- a/web/pgadmin/about/static/js/about.js +++ b/web/pgadmin/about/static/js/about.js @@ -20,7 +20,8 @@ define( }, setup: function() { return { - buttons:[{ text: gettext('OK'), key: 27, className: 'btn btn-primary' }], + buttons:[{ text: gettext('OK'), key: 27, + className: 'btn btn-primary fa fa-lg fa-check pg-alertify-button' }], options: { modal: false, resizable: true, @@ -44,7 +45,7 @@ define( function(data) { alertify.aboutDialog( S(gettext('About %s')).sprintf(pgAdmin.Browser.utils.app_name).value(), data - ).resizeTo(800, 450); + ).resizeTo(pgAdmin.Browser.stdW.md, pgAdmin.Browser.stdH.md); }); }, }; diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js index e7e2aa437..b1c76887d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js @@ -220,14 +220,14 @@ define('pgadmin.node.language', [ }, }, { id: 'lanacl', label: gettext('Privileges'), type: 'collection', - group: 'security', control: 'unique-col-collection', mode: ['edit', 'create'], + group: gettext('Security'), control: 'unique-col-collection', mode: ['edit', 'create'], model: pgBrowser.Node.PrivilegeRoleModel.extend({ privileges: ['U'], }), canAdd: true, canDelete: true, uniqueCol : ['grantee'], },{ id: 'seclabels', label: gettext('Security Labels'), mode: ['edit', 'create'], model: pgBrowser.SecLabelModel, editable: false, - type: 'collection', group: 'security', min_version: 90200, + type: 'collection', group: gettext('Security'), min_version: 90200, canAdd: true, canEdit: false, canDelete: true, control: 'unique-col-collection', }, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js index c716f824f..8775b9fbd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js @@ -72,7 +72,7 @@ define('pgadmin.node.schema', [ var grid = self.grid = new Backgrid.Grid({ columns: self.grid_columns, collection: self.model.get(self.field.get('name')), - className: 'backgrid table-bordered', + className: 'backgrid table-bordered table-noouter-border table-hover', }); // render grid @@ -120,6 +120,8 @@ define('pgadmin.node.schema', [ // Extend the browser's collection class for VacuumSettingsModel Backform.VacuumSettingsSchema = [{ + id: 'spacer_ctrl', group: gettext('Table'), mode: ['edit', 'create'], type: 'spacer', + },{ id: 'autovacuum_custom', label: gettext('Custom auto-vacuum?'), group: gettext('Table'), mode: ['edit', 'create'], type: 'switch', @@ -184,6 +186,8 @@ define('pgadmin.node.schema', [ ], }), deps: ['autovacuum_enabled'], + },{ + id: 'spacer_ctrl', group: gettext('Toast Table'), mode: ['edit', 'create'], type: 'spacer', },{ id: 'toast_autovacuum', label: gettext('Custom auto-vacuum?'), group: gettext('Toast Table'), mode: ['edit', 'create'], diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js index bb1986bd1..f6d8f3194 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js @@ -228,7 +228,6 @@ define('pgadmin.node.index', [ hasDepends: true, hasStatistics: true, statsPrettifyFields: ['Size', 'Index size'], - width: '45%', Init: function() { /* Avoid mulitple registration of menus */ if (this.initialized) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js index c8a092973..4185aa77d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js @@ -44,7 +44,7 @@ define('pgadmin.node.table', [ sqlCreateHelp: 'sql-createtable.html', dialogHelp: url_for('help.static', {'filename': 'table_dialog.html'}), hasScriptTypes: ['create', 'select', 'insert', 'update', 'delete'], - width: '60%', + width: '650px', Init: function() { /* Avoid multiple registration of menus */ if (this.initialized) diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js index bcc27509e..e60f33044 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js +++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js @@ -187,6 +187,15 @@ define('pgadmin.node.pga_schedule', [ }, }); + var CustomInfoControl = Backform.Control.extend({ + template: _.template([ + '
', + ' <%=infotext%>', + '
', + ].join('\n')), + className: 'pgadmin-control-group', + }); + pgBrowser.Nodes['pga_schedule'] = pgBrowser.Node.extend({ parent_type: 'pga_job', type: 'pga_schedule', @@ -335,6 +344,10 @@ define('pgadmin.node.pga_schedule', [ return this; }, }), mode: ['properties'], + },{ + type: 'control', mode: ['create', 'edit'], group: gettext('Repeat'), + infotext: gettext('Schedules are specified using a cron-style format.
'), + control: CustomInfoControl, },{ type: 'nested', label: gettext('Days'), group: gettext('Repeat'), mode: ['create', 'edit'], @@ -344,11 +357,11 @@ define('pgadmin.node.pga_schedule', [ this, arguments ); - this.$el.prepend( - '
' + - gettext('Schedules are specified using a cron-style format.
') + - '
' - ); + // $( + // '
' + + // gettext('Schedules are specified using a cron-style format.
') + + // '
' + // ).insertBefore(this.$el); return res; }, diff --git a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js index 419ae45f0..0226a5be9 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js +++ b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js @@ -68,18 +68,19 @@ define('pgadmin.node.role', [ var RoleCustomSwitchControl = Backform.SwitchControl.extend({ template: _.template([ - '', - '
', - '
', + '', + '
', + '
', ' ', '
', - ' <% if (helpMessage && helpMessage.length) { %>', - ' <%=helpMessage%>', - ' <% } %>', '
', + '<% if (helpMessage && helpMessage.length) { %>', + ' <%=helpMessage%>', + '<% } %>', ].join('\n')), + className: 'pgadmin-control-group form-group pg-el-12 row', }); var RoleMembersControl = Backform.Control.extend({ diff --git a/web/pgadmin/browser/server_groups/servers/static/css/servers.css b/web/pgadmin/browser/server_groups/servers/static/css/servers.css index e8981cf59..65f9f53db 100644 --- a/web/pgadmin/browser/server_groups/servers/static/css/servers.css +++ b/web/pgadmin/browser/server_groups/servers/static/css/servers.css @@ -9,4 +9,4 @@ .change_password { padding-left: 7px; -} +} \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js index 25d85a8b4..7e9dd79d6 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js @@ -302,7 +302,7 @@ define('pgadmin.node.tablespace', [ }; }); } - Alertify.move_objects_dlg(true).resizeTo('40%','50%'); + Alertify.move_objects_dlg(true).resizeTo(pgBrowser.stdW.md,pgBrowser.stdH.md); }, }, model: pgBrowser.Node.Model.extend({ diff --git a/web/pgadmin/browser/server_groups/static/js/server_group.js b/web/pgadmin/browser/server_groups/static/js/server_group.js index 58d1ccd25..93053a959 100644 --- a/web/pgadmin/browser/server_groups/static/js/server_group.js +++ b/web/pgadmin/browser/server_groups/static/js/server_group.js @@ -9,8 +9,8 @@ define('pgadmin.node.server_group', [ type: 'server_group', dialogHelp: url_for('help.static', {'filename': 'server_group_dialog.html'}), label: gettext('Server Group'), - width: '350px', - height: '250px', + width: '250px', + height: '150px', is_collection: true, Init: function() { /* Avoid multiple registration of menus */ diff --git a/web/pgadmin/browser/static/css/wizard.css b/web/pgadmin/browser/static/css/wizard.css index 1cdded009..d293881f8 100644 --- a/web/pgadmin/browser/static/css/wizard.css +++ b/web/pgadmin/browser/static/css/wizard.css @@ -44,30 +44,11 @@ width: 140px; } -.wizard-right-panel_content { - padding: 0.5rem 0rem; -} - /* Wizard Footer CSS */ .pgadmin-wizard .footer .row { margin: 0 -6px 3px -6px; } -/* Wizard Button CSS */ - -.pgadmin-wizard .wizard-buttons button.wizard-next i.fa { - padding-left: 5px; -} - -.pgadmin-wizard .wizard-buttons button.wizard-back i.fa, -.pgadmin-wizard .wizard-buttons button.wizard-cancel i.fa { - padding-right: 5px; -} - -.pgadmin-wizard .wizard-buttons .wizard-finish { - margin-right: 0 !important; -} - .wizard-header .wizard-cancel-event { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAdklEQVQ4jd2SwQnAIAxF36GH0pOTFHEgF3IkR5LO0F4SCGJVEHroAy/f/E+igV+yAa6hO7nrcgAZuIBg9CBalppXEnDL0RA1q556ASdQqhBrLlLTxVch1uxHZiU2AuKs2Vdt23GGHSy/wfIvzOzBPhpjaRO/5wG/szevJ+ZXzAAAAABJRU5ErkJggg==) no-repeat center center; padding: 10px; diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js index 00f1dd8ad..44f429d9f 100644 --- a/web/pgadmin/browser/static/js/browser.js +++ b/web/pgadmin/browser/static/js/browser.js @@ -108,6 +108,19 @@ define('pgadmin.browser', [ // It will be used to register extensions, tools, child node scripts, // etc. scripts: {}, + // Standard Widths and Height for dialogs in px + stdW: { + sm: 500, + md: 700, + lg: 900, + default: 500, + }, + stdH: { + sm: 200, + md: 400, + lg: 550, + default: 550, + }, // Default panels panels: { // Panel to keep the left hand browser tree diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js index 9fe31aeab..76de99645 100644 --- a/web/pgadmin/browser/static/js/node.js +++ b/web/pgadmin/browser/static/js/node.js @@ -313,18 +313,19 @@ define('pgadmin.browser.node', [ } var onSessionInvalid = function(msg) { - var alertMessage = '\ -
\ -
\ -
\ - \ -
\ -
' + msg + '
\ -
\ - x\ -
\ -
\ -
'; + var alertMessage = ` +
+
+
+ +
+
${msg}
+
+ +
+
+
`; + if (!_.isUndefined(that.statusBar)) { that.statusBar.html(alertMessage).css('visibility', 'visible'); that.statusBar.find('a.close-error').bind('click', function() { @@ -558,12 +559,43 @@ define('pgadmin.browser.node', [ d.body.insertBefore(el, d.body.firstChild); - var pW = screen.width < 800 ? '95%' : '500px', - pH = screen.height < 600 ? '95%' : '550px', - w = pgAdmin.toPx(el, self.width || pW, 'width', true), - h = pgAdmin.toPx(el, self.height || pH, 'height', true), - x = (b.offsetWidth - w) / 2, - y = (b.offsetHeight - h) / 2; + let w, h, x, y; + if(screen.width < 800) { + w= pgAdmin.toPx(el, '95%', 'width', true); + } else { + w= pgAdmin.toPx(el, self.width || pgBrowser.stdW.default+'px', 'width', true); + + /* Fit to standard sizes */ + if(w <= pgBrowser.stdW.sm) { + w = pgBrowser.stdW.sm; + } else { + if(w <= pgBrowser.stdW.md) { + w = pgBrowser.stdW.md; + } else { + w = pgBrowser.stdW.lg; + } + } + } + + if(screen.height < 600) { + h = pgAdmin.toPx(el, '95%', 'height', true); + } else { + h = pgAdmin.toPx(el, self.height || pgBrowser.stdH.default+'px', 'height', true); + + /* Fit to standard sizes */ + if(h <= pgBrowser.stdH.sm) { + h = pgBrowser.stdH.sm; + } else { + if(h <= pgBrowser.stdH.md) { + h = pgBrowser.stdH.md; + } else { + h = pgBrowser.stdH.lg; + } + } + } + + x = (b.offsetWidth - w) / 2, + y = (b.offsetHeight - h) / 4; var p = pgBrowser.docker.addPanel( 'node_props', wcDocker.DOCK.FLOAT, undefined, { @@ -1319,7 +1351,7 @@ define('pgadmin.browser.node', [ var btnGroup = this.find('.pg-prop-btn-group'), btnSave = btnGroup.find('button.btn-primary'), - btnReset = btnGroup.find('button.btn-warning'); + btnReset = btnGroup.find('button.btn-secondary[type="reset"]'); if (hasError || !modified) { btnSave.prop('disabled', true); diff --git a/web/pgadmin/browser/static/js/panel.js b/web/pgadmin/browser/static/js/panel.js index 45131d10e..09c21a9f8 100644 --- a/web/pgadmin/browser/static/js/panel.js +++ b/web/pgadmin/browser/static/js/panel.js @@ -142,10 +142,10 @@ define( p.pgResizeTimeout = null; /** Calculations based on https://getbootstrap.com/docs/4.1/layout/grid/#grid-options **/ - if (w < 576) { + if (w < 480) { w = 'xs'; } - if (w >= 576) { + if (w >= 480) { w = 'sm'; } if (w >= 768) { diff --git a/web/pgadmin/browser/static/js/toolbar.js b/web/pgadmin/browser/static/js/toolbar.js index 7719c29a7..b01e28e80 100644 --- a/web/pgadmin/browser/static/js/toolbar.js +++ b/web/pgadmin/browser/static/js/toolbar.js @@ -13,6 +13,7 @@ let _defaultToolBarButtons = [ text: '', toggled: false, toggleClass: '', + parentClass: 'pg-toolbar-btn', enabled: false, }, { @@ -21,6 +22,7 @@ let _defaultToolBarButtons = [ text: '', toggled: false, toggleClass: '', + parentClass: 'pg-toolbar-btn', enabled: false, }, { @@ -29,6 +31,7 @@ let _defaultToolBarButtons = [ text: '', toggled: false, toggleClass: '', + parentClass: 'pg-toolbar-btn', enabled: false, }, ]; diff --git a/web/pgadmin/browser/static/js/wizard.js b/web/pgadmin/browser/static/js/wizard.js index fbb1a5785..401a7342f 100644 --- a/web/pgadmin/browser/static/js/wizard.js +++ b/web/pgadmin/browser/static/js/wizard.js @@ -106,20 +106,19 @@ define([ '
' + '
' + '
' + - ' ' + + ' ' + '
' + '
' + ' ' + + '  ' + gettext('Cancel') + '' + ' ' + + '  ' + gettext('Back') + '' + ' ' + + '  ' + ' ' + + '  ' + gettext('Finish') + '' + '
' + '
' + '
' + diff --git a/web/pgadmin/browser/static/scss/_browser.scss b/web/pgadmin/browser/static/scss/_browser.scss index 158d2891c..76c230cd7 100644 --- a/web/pgadmin/browser/static/scss/_browser.scss +++ b/web/pgadmin/browser/static/scss/_browser.scss @@ -46,3 +46,8 @@ samp, text-align: center; color: $loading-fg; } + +.pg-toolbar-btn { + margin-left: 0.25rem; + border: $input-btn-border-width solid $btn-secondary-border; +} \ No newline at end of file diff --git a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss index 59572914e..caf54f23c 100644 --- a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss +++ b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss @@ -82,7 +82,7 @@ $bgproc-container-pad: 2px; .ajs-bg-bgprocess > .pg-bg-bgprocess > .pg-bg-status.bg-failed { color: $color-fg; - background-color: $color-danger-light; + background-color: $color-danger-lighter; } .pg-panel-content div.bg-process-watcher { diff --git a/web/pgadmin/misc/file_manager/static/css/file_manager.css b/web/pgadmin/misc/file_manager/static/css/file_manager.css index 23824fa7b..dd7596b4c 100644 --- a/web/pgadmin/misc/file_manager/static/css/file_manager.css +++ b/web/pgadmin/misc/file_manager/static/css/file_manager.css @@ -236,10 +236,8 @@ a.dz-remove { .file_listing .no_folder_found { text-align: center; - position: absolute; - top: 50px; width: 100%; - font-size: 14px; + padding: 0.5rem; } div.change_file_types span { diff --git a/web/pgadmin/misc/file_manager/static/js/file_manager.js b/web/pgadmin/misc/file_manager/static/js/file_manager.js index 1dccd79b2..ed4f99e40 100644 --- a/web/pgadmin/misc/file_manager/static/js/file_manager.js +++ b/web/pgadmin/misc/file_manager/static/js/file_manager.js @@ -29,9 +29,9 @@ define('misc.file_manager', [ // Call dialogs subject to dialog_type param show_dialog: function(params) { if (params.dialog_type == 'create_file') { - Alertify.createModeDlg(params).resizeTo('60%', '80%'); + Alertify.createModeDlg(params).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.lg); } else { - Alertify.fileSelectionDlg(params).resizeTo('60%', '80%'); + Alertify.fileSelectionDlg(params).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.lg); } }, }; diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js index 5fbf0a55f..0733e52d4 100644 --- a/web/pgadmin/misc/file_manager/static/js/utility.js +++ b/web/pgadmin/misc/file_manager/static/js/utility.js @@ -576,7 +576,7 @@ define([ result += ''; } else { - result += ''; + result += '
'; result += ''; result += '
'; result += '' + lg.name + '' + lg.size + ''; @@ -659,16 +659,15 @@ define([ if ($('.fileinfo').data('view') == 'grid') { result += '
    '; } else { - result += ''; - result += ''; - result += ''; + result += '
    ' + - lg.name + '' + lg.size + - '' + lg.modified + - '
    '; + result += '' + + '' + + '' + + ''; + result += ''; + result += '
    ' + lg.name + '' + lg.size + '' + lg.modified + '
    '; } - result += '

    ' + - lg.could_not_retrieve_folder + '

    '; - + result += '
    ' + lg.could_not_retrieve_folder + '
    '; var cap_no_folders = ['upload', 'create']; data.Capabilities = cap_no_folders; @@ -691,7 +690,7 @@ define([ if ($('.fileinfo').data('view') == 'grid') { e.stopPropagation(); $this = $('.file_manager').find('#contents li.selected p'); - orig_value = decodeURI($this.find('span').attr('title')); + orig_value = decodeURI($this.find('span.less_text').attr('title')); newvalue = orig_value.substring(0, orig_value.indexOf('.')); if (newvalue === '') { @@ -715,7 +714,7 @@ define([ $this = $('.fileinfo').find( 'table#contents tbody tr.selected td:first-child p' ); - orig_value = decodeURI($this.find('span').html()), + orig_value = decodeURI($this.find('span.less_text').html()), newvalue = orig_value.substring(0, orig_value.lastIndexOf('.')); if (orig_value.lastIndexOf('/') == orig_value.length - 1 || newvalue === '') { @@ -1137,7 +1136,7 @@ define([
    - +
    `; } diff --git a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss index 85f854633..2d90a67ff 100644 --- a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss +++ b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss @@ -142,6 +142,9 @@ .allowed_file_types { border-top: $panel-border; + background: $color-bg-theme; + z-index: 5; + padding: 0.25rem; } .upload_file{ @@ -211,10 +214,10 @@ } .fileinfo .fm_dimmer { - height: calc(100% - 32px); display: none; - top: 0px; - background:$color-fg; + top: 0; + bottom: 0; + background: $loading-bg; opacity: 0.5; width: 100%; position: absolute; @@ -223,10 +226,8 @@ .fileinfo .delete_item, .fileinfo .replace_file { display: none; - padding: 15px 15px; - border: 1px solid $color-gray-light; - border-left: 0; - border-right: 0; + padding: 1rem; + border-bottom: $panel-border; background: $color-bg-theme; position: absolute; top: 0; @@ -235,15 +236,6 @@ z-index: 4; } -.fileinfo .delete_item span.pull-right .btn, -.fileinfo .replace_file span.pull-right .btn { - padding: 0px 5px; - color: $color-fg; - background: $color-bg; - font-size: 12px; - margin-right: 4px; -} - .upload_file .dz_cross_btn { color: $color-fg-theme; right: 0px; diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/index.html b/web/pgadmin/misc/file_manager/templates/file_manager/index.html index 9d1e3673a..f854545e1 100644 --- a/web/pgadmin/misc/file_manager/templates/file_manager/index.html +++ b/web/pgadmin/misc/file_manager/templates/file_manager/index.html @@ -64,16 +64,16 @@
    {{ _('Are you sure you want to delete this item?') }} - - - - + + + +
    {{ _('Are you sure you want to replace this file?') }} - - + +
    diff --git a/web/pgadmin/misc/static/explain/css/explain.css b/web/pgadmin/misc/static/explain/css/explain.css index b6d413ccc..7c4ee9994 100644 --- a/web/pgadmin/misc/static/explain/css/explain.css +++ b/web/pgadmin/misc/static/explain/css/explain.css @@ -6,11 +6,11 @@ cursor: pointer; } -.pg-explain-zoom-btn { +.pg-explain-zoom-btn, +.pg-explain-download-btn { top: 5px; min-width: 25px; cursor: pointer; - border: 1px solid transparent; font-size: 0.75rem; } @@ -72,10 +72,3 @@ td.explain-tooltip-val { left: 79px; opacity: 0.5; } - -.pg-explain-download-btn { - top: 5px; - min-width: 25px; - border: 1px solid transparent; - font-size: 0.75rem; -} diff --git a/web/pgadmin/preferences/static/js/preferences.js b/web/pgadmin/preferences/static/js/preferences.js index 511c80a1b..97bb496ca 100644 --- a/web/pgadmin/preferences/static/js/preferences.js +++ b/web/pgadmin/preferences/static/js/preferences.js @@ -307,12 +307,6 @@ define('pgadmin.preferences', [ /* * Clear the existing html in the preferences content */ - // Keyboard short cuts and nodes wiull have striped divs - if (d.label.toLowerCase() == 'keyboard shortcuts' || d.label.toLowerCase() == 'nodes') - $container.find('.preferences_content').addClass('striped-divs'); - else - $container.find('.preferences_content').removeClass('striped-divs'); - $container.find('.preferences_content'); renderPreferencePanel(d.preferences); @@ -477,7 +471,7 @@ define('pgadmin.preferences', [ }, show: function() { - Alertify.preferencesDlg(true).resizeTo('60%', '60%'); + Alertify.preferencesDlg(true).resizeTo(pgAdmin.Browser.stdW.lg,pgAdmin.Browser.stdH.lg); }, }; diff --git a/web/pgadmin/preferences/static/scss/_preferences.scss b/web/pgadmin/preferences/static/scss/_preferences.scss index 7c8d674a5..14b52d32f 100644 --- a/web/pgadmin/preferences/static/scss/_preferences.scss +++ b/web/pgadmin/preferences/static/scss/_preferences.scss @@ -3,22 +3,13 @@ padding-top: 2px; height: 100%; overflow: auto; - border-right: 2px solid $color-gray-light; - background-image: $color-gray-lighter; -} - -.preferences_content { - &.striped-divs > { - div.pgadmin-control-group:nth-of-type(odd) { - background: $color-gray-light; - padding-top: 6px; - } - div.pgadmin-control-group:nth-of-type(even) { - background: $color-bg-theme; - } - } + border-right: $panel-border; } .btn-checkbox { padding: $btn-checkbox-padding; + + & input[type="checkbox"]{ + margin-top: 0px !important; + } } diff --git a/web/pgadmin/static/js/alertify.pgadmin.defaults.js b/web/pgadmin/static/js/alertify.pgadmin.defaults.js index 2d093df34..83047985a 100644 --- a/web/pgadmin/static/js/alertify.pgadmin.defaults.js +++ b/web/pgadmin/static/js/alertify.pgadmin.defaults.js @@ -197,10 +197,10 @@ define([ this.pgResizeTimeout = null; /** Calculations based on https://getbootstrap.com/docs/4.1/layout/grid/#grid-options **/ - if (w < 576) { + if (w < 480) { w = 'xs'; } - if (w >= 576) { + if (w >= 480) { w = 'sm'; } if (w >= 768) { diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js index 024a7eedf..357be9e4f 100644 --- a/web/pgadmin/static/js/backform.pgadmin.js +++ b/web/pgadmin/static/js/backform.pgadmin.js @@ -2288,7 +2288,7 @@ define([ '
    ', ' <%=required ? "required" : ""%> />', '
    ', - '', + '', '
    ', '
    ', '<% if (helpMessage && helpMessage.length) { %>', diff --git a/web/pgadmin/static/js/slickgrid/editors.js b/web/pgadmin/static/js/slickgrid/editors.js index 2d732c56e..18e8494ce 100644 --- a/web/pgadmin/static/js/slickgrid/editors.js +++ b/web/pgadmin/static/js/slickgrid/editors.js @@ -36,7 +36,13 @@ function getButtons(editable) { var $buttons = $('
    '), label = editable ? 'Cancel' : 'OK', - button_type = editable ? 'btn-danger' : 'btn-primary'; + button_type = editable ? 'btn-secondary' : 'btn-primary', + button_icon = editable ? 'fa-times' : 'fa-check'; + + $('') + .appendTo($buttons); if (editable) { $('') .appendTo($buttons); } - - $('') - .appendTo($buttons); return $buttons; } @@ -140,8 +141,8 @@ $input = getTextArea().appendTo($wrapper); $buttons = getButtons(true).appendTo($wrapper); - $buttons.find('button:first').on('click', this.save); - $buttons.find('button:last').on('click', this.cancel); + $buttons.find('button:first').on('click', this.cancel); + $buttons.find('button:last').on('click', this.save); $input.on('keydown', this.handleKeyDown); scope.position(args.position); diff --git a/web/pgadmin/static/js/sqleditor/filter_dialog.js b/web/pgadmin/static/js/sqleditor/filter_dialog.js index 6dc9571be..f25ef3127 100644 --- a/web/pgadmin/static/js/sqleditor/filter_dialog.js +++ b/web/pgadmin/static/js/sqleditor/filter_dialog.js @@ -112,19 +112,17 @@ let FilterDialog = { this.__internal.buttons[2].element.disabled = true; // Status bar - this.statusBar = $('
    ' + - '
    ' + - '
    ' + - '
    ' + - ' ' + - '
    ' + - '
    ' + - '
    ' + - '
    ' + - '
    ' + - '
    ', { - text: '', - }).appendTo($container); + this.statusBar = $( + '
    ' + + '
    ' + + '
    ' + + '
    ' + + ' ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ').appendTo($container); // To show progress on filter Saving/Updating on AJAX this.showFilterProgress = $( @@ -259,7 +257,7 @@ let FilterDialog = { }; }); - Alertify.filterDialog(title).resizeTo('65%', '60%'); + Alertify.filterDialog(title).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.md); }) .fail(function(e) { handleQueryToolAjaxError(pgAdmin, handler, e, '_show_filter', [], true); diff --git a/web/pgadmin/static/js/sqleditor/query_tool_notifications.js b/web/pgadmin/static/js/sqleditor/query_tool_notifications.js index 500d20590..1a04254b1 100644 --- a/web/pgadmin/static/js/sqleditor/query_tool_notifications.js +++ b/web/pgadmin/static/js/sqleditor/query_tool_notifications.js @@ -88,14 +88,15 @@ let queryToolNotifications = { // Set up the grid let notifications_grid = new Backgrid.Grid({ + emptyText: 'No data found', columns: gridCols, collection: queryToolNotifications.collection, - className: 'backgrid table-bordered presentation table backgrid-striped', + className: 'backgrid presentation table table-bordered table-hover table-noouter-border table-bottom-border', }); // Render the grid if (notifications_grid) - notifications_panel.$container.append(notifications_grid.render().el); + notifications_panel.$container.find('.sql-editor-notifications').append(notifications_grid.render().el); }, // This function is used to raise notify messages and update the diff --git a/web/pgadmin/static/scss/_aci_tree.overrides.scss b/web/pgadmin/static/scss/_aci_tree.overrides.scss index ad7751730..70a0c9166 100644 --- a/web/pgadmin/static/scss/_aci_tree.overrides.scss +++ b/web/pgadmin/static/scss/_aci_tree.overrides.scss @@ -3,7 +3,7 @@ } .aciTree .aciTreeText { font-family: $font-family-primary; - font-size: 12px; + font-size: 0.815rem; } .aciTree.aciTreeFocus .aciTreeFocus > .aciTreeLine { background-color: $color-primary-light; diff --git a/web/pgadmin/static/scss/_alert.scss b/web/pgadmin/static/scss/_alert.scss index 507b94775..4f59011da 100644 --- a/web/pgadmin/static/scss/_alert.scss +++ b/web/pgadmin/static/scss/_alert.scss @@ -104,25 +104,17 @@ } .alert-text { - flex-grow: 1; - border: 1px solid $color-danger-light; - padding: 6px 12px 6px 10px; - border-left: none; -moz-user-select: text; -khtml-user-select: text; -webkit-user-select: text; -ms-user-select: text; user-select: text; - width: 100%; } .error-in-footer { - border-radius: 5px; - border: 1px solid transparent; - - .alert-text { - border-color: $color-danger-light; - } + border-radius: $border-radius; + border: 1px solid $color-danger-light; + background: $color-danger-lighter; } .success-in-footer { diff --git a/web/pgadmin/static/scss/_alertify.overrides.scss b/web/pgadmin/static/scss/_alertify.overrides.scss index c7382d4bb..235c9fdb4 100644 --- a/web/pgadmin/static/scss/_alertify.overrides.scss +++ b/web/pgadmin/static/scss/_alertify.overrides.scss @@ -32,7 +32,7 @@ border-top-left-radius: $panel-border-radius; border-top-right-radius: $panel-border-radius; & .ajs-content { - top: 0; + top: 0 !important; border-radius: inherit; } } @@ -48,7 +48,8 @@ } } .ajs-body .ajs-content { - top: $title-height; + top: $title-height !important; + bottom: $footer-height-calc !important; } /* Removes padding from alertify footer */ @@ -114,6 +115,10 @@ } } +.alertify.ajs-frameless .ajs-body .ajs-content { + bottom: 0px !important; +} + .alertify.ajs-maximized .ajs-commands, .alertify.ajs-resizable .ajs-commands { margin: 2px 0px 0 0; @@ -180,11 +185,9 @@ } .pg-alertify-icon-button { - //refered - $input-btn-padding-y, $input-btn-padding-x - padding: 0.275rem $input-btn-padding-x; &:before { font-size: 1.3em !important; - line-height: 1.3; + line-height: 1.2; font-family: $font-family-icon; } } @@ -195,7 +198,7 @@ } .ajs-message.ajs-error.ajs-visible { - background: $color-danger-light; + background: $color-danger-lighter; border: $border-width solid $color-danger; @extend .ajs-text-smoothing; } @@ -215,3 +218,7 @@ .ajs-message > .media > .media-body.media-middle { display: flex; } + +.alertify .ajs-dimmer { + background-color: $loading-bg; +} \ No newline at end of file diff --git a/web/pgadmin/static/scss/_backform.overrides.scss b/web/pgadmin/static/scss/_backform.overrides.scss index 6a04f6145..abc2af4e6 100644 --- a/web/pgadmin/static/scss/_backform.overrides.scss +++ b/web/pgadmin/static/scss/_backform.overrides.scss @@ -1,6 +1,6 @@ .has-error { .pgadmin-controls .form-control { - border-color: $color-danger; + border-color: $color-danger-light; } .form-control { @@ -11,15 +11,15 @@ color: $color-danger; } - .control-label:before { + .control-label::before { font: normal normal normal 16px/1 FontAwesome; content: "\f071"; text-decoration: inherit; position: absolute; color: $color-danger; - right: 6px; - padding-top: 6px; + right: 0.5rem; z-index: 1; + line-height: inherit; } } @@ -36,10 +36,14 @@ } } .backform-tab .tab-pane { - padding: 7px; + padding: 0.5rem; &.SQL { height: 100%; - padding: 0px 7px 0px 0px; + padding: 0px; + + & .pgadmin-controls.SQL { + padding: 0px; + } } } diff --git a/web/pgadmin/static/scss/_backgrid.overrides.scss b/web/pgadmin/static/scss/_backgrid.overrides.scss index 519a56bef..afe1c65e8 100644 --- a/web/pgadmin/static/scss/_backgrid.overrides.scss +++ b/web/pgadmin/static/scss/_backgrid.overrides.scss @@ -1,6 +1,7 @@ .backgrid th, .backgrid td { font-weight: normal!important; text-align: left; + line-height: $line-height-base; } .backgrid.backgrid-striped tbody { @@ -223,6 +224,10 @@ span.form-control:disabled { background-color: $color-bg; border: 1px solid $border-color; border-radius: $panel-border-radius; + + & .tab-pane { + padding: 0.5rem; + } } .subnode-footer { height: 38px; diff --git a/web/pgadmin/static/scss/_bootstrap.overrides.scss b/web/pgadmin/static/scss/_bootstrap.overrides.scss index e7b44e72b..8ab15ad51 100644 --- a/web/pgadmin/static/scss/_bootstrap.overrides.scss +++ b/web/pgadmin/static/scss/_bootstrap.overrides.scss @@ -18,6 +18,10 @@ iframe { border-width: 0; } +legend { + margin-bottom: 0rem; +} + /* Padding for the treeview */ .browser-browser-pane { padding-left: 0; @@ -134,13 +138,19 @@ iframe { border-left: 5px solid; border-top: 5px solid transparent; } +/* 25px is for showing error icon */ .control-label { display: inline-block; margin: 0px; - padding: 5px 25px 5px 5px; + padding: 5px 25px 5px 5px !important; vertical-align: middle; } +.form-check { + padding-left: 0rem; + padding-right: 0.5rem; +} + .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { color: $text-muted; } @@ -259,6 +269,7 @@ td.switch-cell > div.bootstrap-switch { font-weight: bold; &.active { border-bottom: $active-border !important; + color: $color-primary; } } } @@ -311,3 +322,17 @@ td.switch-cell > div.bootstrap-switch { .bootstrap-datetimepicker-widget thead th { background-color: $color-bg; } + +.input-group { + & .input-group-text { + background: $input-bg; + } +} + +/* bootstrap-switch */ +.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary, .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary { + background: $color-primary; +} +.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success, .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success { + background: $color-success; +} diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss index 99b12e09e..0e8ffc7ae 100644 --- a/web/pgadmin/static/scss/_pgadmin.style.scss +++ b/web/pgadmin/static/scss/_pgadmin.style.scss @@ -24,9 +24,6 @@ .user-language div{ float:left; } -.user-language select{ - height: 25px !important; -} .Resizer { background: $color-gray-lighter; @@ -142,7 +139,7 @@ } .alertify .ajs-body { - min-height: $footer-height-calc*2; + min-height: $footer-height-calc*1.5; } @@ -248,6 +245,10 @@ margin-bottom: 33px; } +.pg-prop-btn-group-above { + border-bottom: $panel-border; +} + .has-pg-prop-btn-group { top: 45px; height: calc(100% - 45px); @@ -323,9 +324,10 @@ } .pgadmin-controls { - padding-right: 3px; - padding-left: 3px; + padding-right: 0px; + padding-left: 0px; } + .pgadmin-controls.SQL { padding-right: 3px; padding-left: 1px; @@ -372,6 +374,11 @@ border-radius: 0rem; border-top-left-radius: $card-border-radius; border-top-right-radius: $card-border-radius; + + &.collapsed { + border-bottom: none !important; + border-radius: $card-border-radius; + } } .obj_properties .badge .caret { @@ -502,15 +509,17 @@ fieldset.inline-fieldset > div { padding: 15px; } -.pgadmin-control-group.sql { - margin: 0px; - padding: 0px; - height: 100%; +.pgadmin-control-group{ + &.sql, &.sqltab { + margin: 0px; + padding: 0px; + height: 100%; + } } .pgadmin-controls input[type="checkbox"]{ margin-left: 0 !important; - margin-top: 0px !important; + margin-top: 10px !important; } .pgadmin-controls.sql_field_layout { @@ -520,14 +529,14 @@ fieldset.inline-fieldset > div { z-index: 1; } -.pgadmin-controls.focused { - border-color: $color-primary-light; +.pgadmin-controls.focused, +.pgadmin-controls:focus { + border-color: $input-focus-border-color !important; outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6); + -webkit-box-shadow: $input-focus-box-shadow; + box-shadow: $input-focus-box-shadow; } - .dashboard-tab-container, .pg-panel-statistics-container, .pg-panel-depends-container, @@ -742,14 +751,7 @@ form[name="change_password_form"] .help-block { } } -.close-error-bar { - background: $color-danger; - padding: 5px; - border-radius: 0px 4px 4px 0px; -} - -.close-error-bar a { - color: $color-danger-fg !important; +.close-error { cursor: pointer; } @@ -831,6 +833,15 @@ table.table-bottom-border { } } +table.table-empty-rows{ + thead th:last-of-type,tr:last-of-type{ + & td, & th { + border-bottom: $panel-border; + } + } +} + + .context-menu-list .context-menu-submenu:after { font-family: $font-family-icon; content: "\f054" !important; @@ -852,14 +863,21 @@ table.table-bottom-border { padding-bottom: 1.0rem; } & .panel-body { - padding-botttom: 0.8rem; + padding-bottom: 0.8rem; } & .btn-login { background-color: $security-btn-color; } - & .user-language select { - background-color: transparent; - color: $security-text-color; + & .user-language { + & select{ + background-color: $color-primary; + color: $security-text-color; + + & option{ + background-color: $color-primary; + color: $security-text-color; + } + } } & .pg-icon { width: 28px; @@ -917,7 +935,6 @@ table.table-bottom-border { } } - .backform-tab{ & > .nav.nav-tabs { position: absolute; @@ -928,7 +945,7 @@ table.table-bottom-border { & > .tab-content { position: absolute; top: $title-height; - bottom: 50px; + bottom: $footer-height-calc; } } .ajs-content { diff --git a/web/pgadmin/static/scss/_select2.overrides.scss b/web/pgadmin/static/scss/_select2.overrides.scss index d7bb5b3e5..afecaf7bb 100644 --- a/web/pgadmin/static/scss/_select2.overrides.scss +++ b/web/pgadmin/static/scss/_select2.overrides.scss @@ -30,18 +30,14 @@ height: 100%; } - -.select2-container--default.select2-container--focus -.select2-selection--multiple { - border: 1px solid $color-gray-light !important; - outline: 0 none; -} - .select2-container--default.select2-container--focus { - border-color: $color-primary-light; - outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6); + & .select2-selection--single, + & .select2-selection--multiple { + border-color: $input-focus-border-color !important; + outline: 0; + -webkit-box-shadow: $input-focus-box-shadow; + box-shadow: $input-focus-box-shadow; + } } diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss index 5550a2076..79f68ecc6 100644 --- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss +++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss @@ -29,8 +29,8 @@ } .wcFrameButton { - width: 25px; - height: 20px; + width: 24px; + height: 22px; display: flex; border-radius: $btn-border-radius; margin: auto; @@ -85,6 +85,66 @@ .wcFloating { box-shadow: $box-shadow; z-index: 1050 !important; + + &.wcFrame, & .wcPanelBackground { + border-bottom-left-radius: $card-border-radius; + border-bottom-right-radius: $card-border-radius; + } + + & .pg-panel-content { + border-bottom: $card-border-radius; + } + + & .wcFrameCornerNE, + & .wcFrameCornerNW, + & .wcFrameCornerSE, + & .wcFrameCornerSW { + height: $card-border-radius*2; + width: $card-border-radius*2; + background: transparent; + } + + & .wcFrameCornerNE { + border: $panel-border; + border-left: none !important; + border-bottom: none !important; + border-radius: none; + border-top-right-radius: $card-border-radius; + } + + & .wcFrameCornerNW { + border: $panel-border; + border-right: none !important; + border-bottom: none !important; + border-radius: none; + border-top-left-radius: $card-border-radius; + } + + & .wcFrameCornerSE { + border: $panel-border; + border-top: none !important; + border-left: none !important; + border-radius: none; + border-bottom-right-radius: $card-border-radius; + } + + & .wcFrameCornerSW { + border: $panel-border; + border-right: none !important; + border-top: none !important; + border-radius: none; + border-bottom-left-radius: $card-border-radius; + } + + .wcFrameEdgeH { + left: $card-border-radius !important; + right: $card-border-radius !important; + } + + .wcFrameEdgeV { + top: $card-border-radius !important; + bottom: $card-border-radius !important; + } } .wcFloating .wcPanelTabActive { diff --git a/web/pgadmin/static/scss/resources/_default.style.scss b/web/pgadmin/static/scss/resources/_default.style.scss index 0096d3e9d..f90fe47ad 100644 --- a/web/pgadmin/static/scss/resources/_default.style.scss +++ b/web/pgadmin/static/scss/resources/_default.style.scss @@ -22,6 +22,10 @@ &-light { background-color: $color-danger-light; } + + &-lighter { + background-color: $color-danger-lighter; + } } .bg-success { @@ -81,6 +85,10 @@ &-light { border-color: $color-danger-light; } + + &-lighter { + border-color: $color-danger-lighter; + } } .border-success { diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss index a97bedca8..79eff097d 100644 --- a/web/pgadmin/static/scss/resources/_default.variables.scss +++ b/web/pgadmin/static/scss/resources/_default.variables.scss @@ -19,7 +19,8 @@ $color-secondary: $white !default; $color-danger: #e53935 !default; $color-danger-fg: $white !default; -$color-danger-light: #FBE1E1; +$color-danger-light: #F39999; +$color-danger-lighter: #FAECEC; $color-success: #43a047 !default; $color-success-fg: $black !default; @@ -51,7 +52,7 @@ $font-family-editor: 'Source Code Pro' !default; $font-family-icon: 'FontAwesome' !default; $border-width: 1px; -$border-color: rgba($color-gray, 0.5); +$border-color: #dde0e6; $border-color-dark: $color-gray; $box-shadow: 0 0.5rem 3rem $color-gray-dark; @@ -59,7 +60,8 @@ $box-shadow: 0 0.5rem 3rem $color-gray-dark; $gray-600: $color-gray-dark; $gray-900: $color-fg-theme; $body-color: $color-fg-theme; -$font-size-base: 0.815rem; +$font-size-base: 0.875rem; +$line-height-base: 1.5; // no change $grid-gutter-width: 15px; $border-radius: 0.25rem; //no change @@ -122,9 +124,19 @@ $input-border-radius: $border-radius; //no change $input-disabled-bg: $color-gray-lighter; $input-btn-border-width: $border-width; //no change $input-border-width: $input-btn-border-width; //no change -$input-btn-padding-y: .375rem; //no change +$input-btn-padding-y: .25rem; $input-btn-padding-x: .75rem; //no change +$component-active-bg: $color-primary; //no change +$input-btn-focus-width: .2rem !default; //no change +$input-btn-focus-color: rgba($component-active-bg, .25) !default; //no change +$input-btn-focus-box-shadow: 0 0 0 $input-btn-focus-width $input-btn-focus-color !default; //no change +$input-focus-bg: $input-bg !default; //no change +$input-focus-border-color: lighten($component-active-bg, 25%) !default; //no change +$input-focus-color: $input-color !default; //no change +$input-focus-width: $input-btn-focus-width !default; //no change +$input-focus-box-shadow: $input-btn-focus-box-shadow !default; //no change + $btn-border-radius: $border-radius; //no change /***************/ @@ -136,12 +148,12 @@ $panel-border-radius: $border-radius; $panel-border: $panel-border-width solid $panel-border-color !important; $panel-border-dark: $panel-border-width solid $border-color-dark !important; $tabs-padding: 5px 10px 2px; -$title-height: 37px * $font-size-base/1rem; +$title-height: ($line-height-base*16px) + 5px + 2px + $border-width; $footer-padding: 0.5rem; -$footer-min-height: 2.18rem; +$footer-min-height: 2rem; $footer-height-calc: $footer-min-height+$footer-padding*2; -$navbar-font-size: 0.875rem; -$navbar-user-font-size: 0.815rem; +$navbar-font-size: 0.925rem; +$navbar-user-font-size: 0.875rem; $navbar-dropdown-top: 100%; $dropdown-submenu-top: -$dropdown-spacer; @@ -160,7 +172,7 @@ $sql-gutters-bg: $color-gray-light; $sql-history-detail-bg: $color-gray-lighter; $sql-history-success-bg: $color-primary-light; $sql-history-success-fg: $color-primary; -$sql-history-error-bg: $color-danger-light; +$sql-history-error-bg: $color-danger-lighter; $sql-history-error-fg: $color-danger; $negative-bg: $color-gray-light; @@ -175,7 +187,7 @@ $btn-secondary-hover-bg: $color-gray-light; $card-header-padding : 0.25rem 0.5rem; $no-border-radius: 0px !important; -$btn-checkbox-padding: 0.3rem 0.8rem; +$btn-checkbox-padding: $input-btn-padding-y $input-btn-padding-x; $security-text-color: $white; $security-btn-color: #038bba; diff --git a/web/pgadmin/static/vendor/backform/backform.js b/web/pgadmin/static/vendor/backform/backform.js index b0b725117..b0d2fd4ab 100644 --- a/web/pgadmin/static/vendor/backform/backform.js +++ b/web/pgadmin/static/vendor/backform/backform.js @@ -404,7 +404,6 @@ var SpacerControl = Backform.SpacerControl = Control.extend({ template: _.template([ - '', '
    ' ].join("\n")) }); @@ -558,7 +557,7 @@ }, template: _.template([ '', - '
    ', + '
    ', ' <% for (var i=0; i < options.length; i++) { %>', ' <% var option = options[i]; %>', ' <% var id = _.uniqueId("bf_"); %>', diff --git a/web/pgadmin/static/vendor/backgrid/backgrid.css b/web/pgadmin/static/vendor/backgrid/backgrid.css index 7eb59697f..c4298e220 100644 --- a/web/pgadmin/static/vendor/backgrid/backgrid.css +++ b/web/pgadmin/static/vendor/backgrid/backgrid.css @@ -80,10 +80,6 @@ text-align: center; } -.backgrid td.editor { - padding: 0; -} - .backgrid td.editor, .backgrid tbody tr:nth-child(odd) td.editor { background-color: rgba(82, 168, 236, 0.1); diff --git a/web/pgadmin/templates/security/fields.html b/web/pgadmin/templates/security/fields.html index a07971aa1..efb126b2e 100644 --- a/web/pgadmin/templates/security/fields.html +++ b/web/pgadmin/templates/security/fields.html @@ -4,7 +4,7 @@ type="{% if type %}{{ type }}{% else %}{{ field.type }}{% endif %}" autofocus> {% if field.errors %} {% for error in field.errors %} - {{ error }} + {{ error }} {% endfor %} {% endif %}
    diff --git a/web/pgadmin/templates/security/login_user.html b/web/pgadmin/templates/security/login_user.html index b53f94619..7515c2c2a 100644 --- a/web/pgadmin/templates/security/login_user.html +++ b/web/pgadmin/templates/security/login_user.html @@ -14,8 +14,8 @@ {{ render_field_with_errors(login_user_form.password, "password") }}
    -
    {{ _('Forgotten your password?', url=url_for('browser.forgot_password')) }}
    -
    +
    {{ _('Forgotten your password?', url=url_for('browser.forgot_password')) }}
    +