Browse Source

Merge pull request #3190 from nextcloud/fix-sharing-popover

Fix #3174
tags/v12.0.0beta1
John Molakvoæ 7 years ago
parent
commit
7eec5e0c27

+ 7
- 9
apps/files_sharing/css/sharetabview.css View File

padding: 0 0 16px; padding: 0 0 16px;
} }


#shareWithList li {
#shareWithList > li {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
font-weight: bold;
white-space: normal; white-space: normal;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
opacity: .5; opacity: .5;
} }


#shareWithList .shareOption.menuitem > label:before {
/* Checkboxes positionning */
margin: 0 12px !important;
}

#shareWithList .unshare { #shareWithList .unshare {
padding: 1px 6px; padding: 1px 6px;
vertical-align: text-bottom; vertical-align: text-bottom;
vertical-align: text-top; vertical-align: text-top;
} }


#shareWithList .unshare .icon-delete {
padding-right: 4px;
background-position-x: 0;
display: inline-block;
}

#shareWithList .sharingOptionsGroup .popovermenu:after { #shareWithList .sharingOptionsGroup .popovermenu:after {
right: 3px; right: 3px;
} }
overflow: hidden; overflow: hidden;
vertical-align: middle; vertical-align: middle;
} }
#shareWithList li label {
#shareWithList li .sharingOptionsGroup > .shareOption > label {
padding: 6px; padding: 6px;
margin-right: 8px; margin-right: 8px;
vertical-align: text-top; vertical-align: text-top;

+ 1
- 0
core/css/apps.scss View File

} }
> span { > span {
cursor: pointer; cursor: pointer;
white-space: nowrap;
} }
> p { > p {
width: 150px; width: 150px;

+ 3
- 6
core/css/share.scss View File

#shareWithList { #shareWithList {
list-style-type: none; list-style-type: none;
padding: 8px; padding: 8px;
li {
> li {
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
font-weight: bold; font-weight: bold;
flex-shrink: 0; flex-shrink: 0;
position: relative; position: relative;
.popovermenu { .popovermenu {
right: -6px;
top: 40px;
right: -11px;
top: 35px;
padding: 3px 6px; padding: 3px 6px;
} }
} }
vertical-align: middle; vertical-align: middle;
flex-grow: 5; flex-grow: 5;
} }
li label {
margin-right: 8px;
}
} }


a { a {

+ 4
- 4
core/js/sharedialogshareelistview.js View File

'<ul>' + '<ul>' +
'{{#if isResharingAllowed}} {{#if sharePermissionPossible}} {{#unless isMailShare}}' + '{{#if isResharingAllowed}} {{#if sharePermissionPossible}} {{#unless isMailShare}}' +
'<li>' + '<li>' +
'<span class="shareOption">' +
'<span class="shareOption menuitem">' +
'<input id="canShare-{{cid}}-{{shareWith}}" type="checkbox" name="share" class="permissions checkbox" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' + '<input id="canShare-{{cid}}-{{shareWith}}" type="checkbox" name="share" class="permissions checkbox" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' +
'<label for="canShare-{{cid}}-{{shareWith}}">{{canShareLabel}}</label>' + '<label for="canShare-{{cid}}-{{shareWith}}">{{canShareLabel}}</label>' +
'</span>' + '</span>' +
'{{#if isFolder}}' + '{{#if isFolder}}' +
'{{#if createPermissionPossible}}{{#unless isMailShare}}' + '{{#if createPermissionPossible}}{{#unless isMailShare}}' +
'<li>' + '<li>' +
'<span class="shareOption">' +
'<span class="shareOption menuitem">' +
'<input id="canCreate-{{cid}}-{{shareWith}}" type="checkbox" name="create" class="permissions checkbox" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' + '<input id="canCreate-{{cid}}-{{shareWith}}" type="checkbox" name="create" class="permissions checkbox" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
'<label for="canCreate-{{cid}}-{{shareWith}}">{{createPermissionLabel}}</label>' + '<label for="canCreate-{{cid}}-{{shareWith}}">{{createPermissionLabel}}</label>' +
'</span>' + '</span>' +
'{{/unless}}{{/if}}' + '{{/unless}}{{/if}}' +
'{{#if updatePermissionPossible}}{{#unless isMailShare}}' + '{{#if updatePermissionPossible}}{{#unless isMailShare}}' +
'<li>' + '<li>' +
'<span class="shareOption">' +
'<span class="shareOption menuitem">' +
'<input id="canUpdate-{{cid}}-{{shareWith}}" type="checkbox" name="update" class="permissions checkbox" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' + '<input id="canUpdate-{{cid}}-{{shareWith}}" type="checkbox" name="update" class="permissions checkbox" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
'<label for="canUpdate-{{cid}}-{{shareWith}}">{{updatePermissionLabel}}</label>' + '<label for="canUpdate-{{cid}}-{{shareWith}}">{{updatePermissionLabel}}</label>' +
'</span>' + '</span>' +
'{{/unless}}{{/if}}' + '{{/unless}}{{/if}}' +
'{{#if deletePermissionPossible}}{{#unless isMailShare}}' + '{{#if deletePermissionPossible}}{{#unless isMailShare}}' +
'<li>' + '<li>' +
'<span class="shareOption">' +
'<span class="shareOption menuitem">' +
'<input id="canDelete-{{cid}}-{{shareWith}}" type="checkbox" name="delete" class="permissions checkbox" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' + '<input id="canDelete-{{cid}}-{{shareWith}}" type="checkbox" name="delete" class="permissions checkbox" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
'<label for="canDelete-{{cid}}-{{shareWith}}">{{deletePermissionLabel}}</label>' + '<label for="canDelete-{{cid}}-{{shareWith}}">{{deletePermissionLabel}}</label>' +
'</span>' + '</span>' +

Loading…
Cancel
Save