diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-12-03 07:30:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 07:30:23 +0100 |
| commit | e7458a41f26c5a3e6d38e67a3bc31d961946b45d (patch) | |
| tree | 5d9634e812f18f2abbceae59b53df24e28e39f2c /core | |
| parent | 9563f03ee6e3b1f8fb6f0b77aa316e2de0d7955f (diff) | |
| parent | 2824622febf1c755cefd8a7fa32e7aac8f5abe91 (diff) | |
| download | nextcloud-server-e7458a41f26c5a3e6d38e67a3bc31d961946b45d.tar.gz nextcloud-server-e7458a41f26c5a3e6d38e67a3bc31d961946b45d.zip | |
Merge pull request #12762 from nextcloud/auth-dialog-fix
Polishing of various modal dialogs
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/jquery.ocdialog.scss | 16 | ||||
| -rw-r--r-- | core/js/js.js | 1 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 3 |
3 files changed, 9 insertions, 11 deletions
diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss index b5ae27034af..f25ca142716 100644 --- a/core/css/jquery.ocdialog.scss +++ b/core/css/jquery.ocdialog.scss @@ -17,7 +17,6 @@ } .oc-dialog-title { background: var(--color-main-background); - margin-left: 12px; } .oc-dialog-buttonrow { position: relative; @@ -30,12 +29,10 @@ box-sizing: border-box; width: 100%; background-image: linear-gradient(rgba(255, 255, 255, 0.0), var(--color-main-background)); - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; &.twobuttons { - justify-content: space-between; - } + justify-content: space-between; + } &.onebutton, &.twobuttons.aside { @@ -66,11 +63,13 @@ .oc-dialog-dim { background-color: #000; - opacity: .20; + opacity: .2; z-index: 9999; position: fixed; - top: 0; left: 0; - width: 100%; height: 100%; + top: 0; + left: 0; + width: 100%; + height: 100%; } .oc-dialog-content { @@ -80,7 +79,6 @@ .oc-dialog.password-confirmation { .oc-dialog-content { width: auto; - margin: 12px; input[type=password] { width: 100%; diff --git a/core/js/js.js b/core/js/js.js index 79f268ea6c9..a99a6d547d7 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1790,6 +1790,7 @@ OC.PasswordConfirmation = { var $error = $('<p></p>').addClass('msg warning').text(config.error); } $dialog.find('.oc-dialog-content').append($error); + $dialog.find('.oc-dialog-buttonrow').addClass('aside'); var $buttons = $dialog.find('button'); $buttons.eq(0).hide(); diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index f1fa2b41c9d..5e1bc420970 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -239,7 +239,7 @@ var OCdialogs = { multiselect = false; } - // No grid for IE! + // No grid for IE! if (OC.Util.isIE()) { self.$filePicker.find('#picker-view-toggle').remove(); self.$filePicker.find('#picker-filestable').removeClass('view-grid'); @@ -826,7 +826,6 @@ var OCdialogs = { this.$showGridView.next('#picker-view-toggle') .removeClass('icon-toggle-filelist icon-toggle-pictures') .addClass(show ? 'icon-toggle-filelist' : 'icon-toggle-pictures') - $('.list-container').toggleClass('view-grid', show); }, _getFilePickerTemplate: function() { |