Fixed a typo in the wizard.js, which was not allowing to show the

maximize button in the Grant Wizard.

Also - change the CSS to set the top to '0' of the ajs-content (alertify
content container) for the frameless dialogs.
This commit is contained in:
Ashesh Vashi 2019-01-15 12:59:09 +05:30
parent 8b135f2932
commit 1f082a0488
3 changed files with 22 additions and 15 deletions

View File

@ -49,25 +49,22 @@
margin: 0 -6px 3px -6px;
}
.wizard-header .wizard-cancel-event {
.wizard-header button {
padding: 10px;
margin-top: -1px;
margin-right: 8px;
}
.wizard-header .ajs-close.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;
margin-top: -1px;
}
div.wizard-header.wizard-badge > div > div.col-sm-2 > button.ajs-maximize.wizard-maximize-event.pull-right {
.wizard-header .ajs-maximize.wizard-maximize-event {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAZklEQVQ4jcWTuw2AMAxEn5jBs7B/e0gpmAiKEGRS5QDBSS7v+Q8fSsCWQgDTA+DsGgJYuypumTNkWCWZg9q/HIAOSDim/xTUcu0exXXaxQG0teRVWQPLx2Gbe8B55yNqv7C4GV/TDq//J11odoZgAAAAAElFTkSuQmCC) no-repeat center center;
padding: 10px;
margin-top: -1px;
margin-right: 8px;
}
div.wizard-header.wizard-badge > div > div.col-sm-2 > button.ajs-maximized.ajs-maximize.wizard-maximize-event.pull-right {
.wizard-header .ajs-maximized.wizard-maximize-event {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA8klEQVQ4jZ3QMUpDQRCH8V+ewULQE4iERTyCrQiDCpbaCKKljbV4A89gqVgGrCMDWlpaWwVPoFYiIjYv8hBJXjLN7s7u9+3wZ4aKiOWI2IJOi8dHuM7MXxj3WMHe3CRBKeUGvVJKllJG8CrmoNty6jMsYKeGoY/jtgI4bez7OMjMr2oKwaieRzDMIljDRUSgXQZPeG2cv7GOffQ7ETGPcyw2HozWQWY+jLN3M/MzIu4wwNKf+zeMFVSQmY/YbfzeuiqIiAonZgi1quErHNa9F7xPM8FlAx5iA9ttJRVu8VHDm5k5rDNpLRERWxHR+6c/MZMfLIJDwzY66IkAAAAASUVORK5CYII=) no-repeat center center;
padding: 10px;
margin-top: -1px;
margin-right: 8px;
}
/* Wizard Status bar CSS */

View File

@ -85,9 +85,9 @@ define([
' <% if (this.options.show_header_cancel_btn) { %>' +
' <div class="ml-auto">' +
' <button class="ajs-close wizard-cancel-event pull-right"' +
' title="' + gettext('Close') + '></button>' +
' title="' + gettext('Close') + '"></button>' +
' <% if (this.options.show_header_maximize_btn) { %>' +
' <button class="ajs-maximize wizard-maximize-event pull-right' +
' <button class="ajs-maximize wizard-maximize-event pull-right"' +
' title="' + gettext('Maximize') + '"></button>' +
' <% } %>' +
' </div>' +

View File

@ -47,8 +47,18 @@
z-index: 5;
}
}
.ajs-body .ajs-content {
&.ajs-frameless,
&.ajs-frameless {
& .ajs-body {
& .ajs-content {
top: 0 !important;
}
}
}
&:not(.ajs-frameless) .ajs-body .ajs-content {
top: $title-height !important;
}
.ajs-body .ajs-content {
bottom: $footer-height-calc !important;
}