Compare commits
12 commits
main
...
1406-passw
Author | SHA1 | Date | |
---|---|---|---|
|
5f5df5f0a7 | ||
|
5a0e4b8a19 | ||
|
1dea3cc9af | ||
|
5a274051fc | ||
|
9ba9a8f446 | ||
|
a1f698b6f3 | ||
|
3eece44804 | ||
|
bba8bc84a1 | ||
|
ca8e58b34a | ||
|
5b08caede2 | ||
|
11cf84a985 | ||
|
35109ae446 |
9 changed files with 28 additions and 18 deletions
|
@ -35,7 +35,7 @@ module.exports = {
|
|||
4
|
||||
],
|
||||
'linebreak-style': [
|
||||
'error',
|
||||
'off', // git handles linebreak conversion for us
|
||||
'unix'
|
||||
],
|
||||
'quotes': [
|
||||
|
|
|
@ -149,7 +149,8 @@
|
|||
box-sizing: border-box;
|
||||
align-items: center;
|
||||
padding: 0 6px;
|
||||
line-height: 36px;
|
||||
line-height: 20px;
|
||||
padding: 8px 6px;
|
||||
white-space: nowrap;
|
||||
text-align: center;
|
||||
text-transform: uppercase;
|
||||
|
|
|
@ -43,13 +43,10 @@
|
|||
|
||||
nav {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 600px) {
|
||||
nav .btn-danger {
|
||||
line-height: inherit;
|
||||
align-items: flex-end;
|
||||
.btn-confirm {
|
||||
white-space: normal;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -68,13 +68,10 @@
|
|||
|
||||
nav {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 600px) {
|
||||
nav .btn-danger {
|
||||
line-height: inherit;
|
||||
align-items: flex-end;
|
||||
.btn-confirm {
|
||||
white-space: normal;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -778,7 +778,6 @@ define([
|
|||
UI.confirm = function (msg, cb, opt, force) {
|
||||
cb = cb || function () {};
|
||||
opt = opt || {};
|
||||
|
||||
var message;
|
||||
if (typeof(msg) === 'string') {
|
||||
if (!force) { msg = Util.fixHTML(msg); }
|
||||
|
|
|
@ -189,7 +189,7 @@ define([
|
|||
anywhere else then we can deprecate them and make this a
|
||||
custom modal in common-interface (or here). */
|
||||
cancelClass: 'btn.btn-cancel.btn-register',
|
||||
okClass: 'btn.btn-danger.btn-register',
|
||||
okClass: 'btn.btn-danger.btn-register.btn-confirm',
|
||||
reverseOrder: true,
|
||||
done: function ($dialog) {
|
||||
$dialog.find('> div').addClass('half');
|
||||
|
|
|
@ -175,7 +175,7 @@ define([
|
|||
anywhere else then we can deprecate them and make this a
|
||||
custom modal in common-interface (or here). */
|
||||
cancelClass: 'btn.btn-cancel.btn-register',
|
||||
okClass: 'btn.btn-danger.btn-register',
|
||||
okClass: 'btn.btn-danger.btn-register.btn-confirm',
|
||||
reverseOrder: true,
|
||||
done: function ($dialog) {
|
||||
$dialog.find('> div').addClass('half');
|
||||
|
|
|
@ -38,6 +38,17 @@
|
|||
margin-left: 0.5rem;
|
||||
}
|
||||
|
||||
.alertify {
|
||||
nav {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
align-items: flex-end;
|
||||
.btn-confirm {
|
||||
white-space: normal;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#cp-sidebarlayout-container {
|
||||
#cp-sidebarlayout-rightside {
|
||||
input[type="checkbox"] {
|
||||
|
@ -113,6 +124,11 @@
|
|||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
nav {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: flex-end;
|
||||
}
|
||||
@media (max-width: 840px) {
|
||||
|
||||
.cp-password-container {
|
||||
|
|
|
@ -807,7 +807,7 @@ define([
|
|||
}, {
|
||||
ok: Messages.register_writtenPassword,
|
||||
cancel: Messages.register_cancel,
|
||||
okClass: 'btn.btn-danger',
|
||||
okClass: 'btn.btn-danger.btn-confirm',
|
||||
reverseOrder: true,
|
||||
done: function($dialog) {
|
||||
$dialog.find('> div').addClass('half');
|
||||
|
|
Loading…
Reference in a new issue