IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the issue - preferences were saved.

Browse Source 
It was regression of the commit-id:
533aaa2fa3.
This commit is contained in:
Ashesh Vashi
2016-04-25 11:53:48 +05:30
parent 1b44aed456
commit 0e50f4b1f3
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/preferences/templates/preferences/preferences.js
View File

@@ -353,11 +353,11 @@ define(
return { return {
buttons:[ buttons:[
{ {
text: "{{ _(' <span class=button-label> OK </span>') }}", key: 13, className: "btn btn-primary fa fa-lg fa-save" text: "{{ _('OK') }}", key: 13, className: "btn btn-primary fa fa-lg fa-save pg-alertify-button"
}, },
{ {
text: "{{ _(' <span class=button-label> Cancel </span>') }}", className: "btn btn-danger fa fa-lg fa-close" text: "{{ _('Cancel') }}", className: "btn btn-danger fa fa-lg fa-times pg-alertify-button"
} }
], ],
focus: { element: 0 }, focus: { element: 0 },

32
web/pgadmin/static/css/overrides.css
View File

@@ -351,21 +351,16 @@ iframe {
border-left-style: solid border-left-style: solid
} }
.pg-prop-btn-group-below .pg-prop-btn-group button { .pg-prop-btn-group button {
margin: 2px 5px; margin: 2px 3px 2px 0px;
} }
.pg-prop-btn-group button:not(:first-child):not(:last-child) { .pg-prop-btn-group button:first-child {
margin-left: 0px; margin-left: 3px;
} }
.pg-prop-btn-group-below button:not(:first-child):not(:last-child) { .pg-prop-btn-group button:last-child {
margin-left: 2px; margin-right: 3px;
margin-right: 5px;
}
.btn-primary{
margin: 2px 13px !important;
} }
.pg-prop-content { .pg-prop-content {
@@ -1013,13 +1008,13 @@ ul.nav.nav-tabs {
.alertify .ajs-footer .ajs-buttons.ajs-auxiliary .ajs-button, .alertify .ajs-footer .ajs-buttons.ajs-primary .ajs-button { .alertify .ajs-footer .ajs-buttons.ajs-auxiliary .ajs-button, .alertify .ajs-footer .ajs-buttons.ajs-primary .ajs-button {
margin-left: 2px; margin-left: 2px;
margin-right: 2px; margin-right: 2px;
margin-top:0px; margin-top:2px;
margin-bottom:0px; margin-bottom:0px;
} }
.alertify .ajs-footer .ajs-buttons .ajs-button { .alertify .ajs-footer .ajs-buttons .ajs-button {
min-width: 55px; min-width: 80px;
min-height: 33px; min-height: 30px;
} }
.alertify .ajs-commands { .alertify .ajs-commands {
@@ -1090,6 +1085,11 @@ span.button-label {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: initial; font-size: initial;
} }
button.ajs-button.btn.btn-primary { button.pg-alertify-button {
margin: 2px!important; font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: initial;
}
.fa.pg-alertify-button:before {
font: normal normal normal 18px/1 FontAwesome;
margin-right: 5px;
} }