Skip to content

[stable15] Polishing of various modal dialogs #12784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Dec 4, 2018
Merged

[stable15] Polishing of various modal dialogs #12784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix dialogs, button position 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
  • Loading branch information
@jancborchardt
jancborchardt authored and Backportbot committed Dec 3, 2018
commit e71dbb133f0eb9881e07edcf010e6c8722909919
16 changes: 7 additions & 9 deletions core/css/jquery.ocdialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
}
.oc-dialog-title {
background: var(--color-main-background);
margin-left: 12px;
}
.oc-dialog-buttonrow {
position: relative;
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -80,7 +79,6 @@
.oc-dialog.password-confirmation {
.oc-dialog-content {
width: auto;
margin: 12px;

input[type=password] {
width: 100%;
Expand Down
1 change: 1 addition & 0 deletions core/js/js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions core/js/oc-dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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() {
Expand Down
11 changes: 7 additions & 4 deletions settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,15 @@ input {
transform: translate(-50%, -50%);
background: #fff;
color: #333;
border-radius: var(--border-radius);
box-shadow: 0 0 7px #888;
border-radius: var(--border-radius-large);
box-shadow: 0 0 10px var(--color-box-shadow);
padding: 15px;
.jcrop-holder {
box-shadow: 0 0 7px #888;
.jcrop-holder,
.jcrop-holder img,
img.jcrop-preview {
border-radius: var(--border-radius);
}

.button {
margin-top: 15px;
}
Expand Down