upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #12762 from nextcloud/auth-dialog-fix

Browse source 
Polishing of various modal dialogs
This commit is contained in:
John Molakvoæ 2018-12-03 07:30:23 +01:00 committed by GitHub
commit e7458a41f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/css/jquery.ocdialog.scss
View file

@ -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%;

1
core/js/js.js
View file

@ -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();

3
core/js/oc-dialogs.js
View file

@ -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() {

11
settings/css/settings.scss
View file

@ -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;
}