Skip to content

Fix #3174 #3190

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
skjnldsv merged 1 commit into from
Jan 22, 2017
+15 −19
Merged

Fix #3174 #3190

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
16 changes: 7 additions & 9 deletions apps/files_sharing/css/sharetabview.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,9 @@
padding: 0 0 16px;
}

#shareWithList li {
#shareWithList > li {
padding-top: 5px;
padding-bottom: 5px;
font-weight: bold;
white-space: normal;
display: inline-flex;
align-items: center;
Expand All @@ -70,6 +69,11 @@
opacity: .5;
}

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

#shareWithList .unshare {
padding: 1px 6px;
vertical-align: text-bottom;
Expand All @@ -78,12 +82,6 @@
vertical-align: text-top;
}

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

#shareWithList .sharingOptionsGroup .popovermenu:after {
right: 3px;
}
Expand All @@ -100,7 +98,7 @@
overflow: hidden;
vertical-align: middle;
}
#shareWithList li label {
#shareWithList li .sharingOptionsGroup > .shareOption > label {
padding: 6px;
margin-right: 8px;
vertical-align: text-top;
Expand Down
1 change: 1 addition & 0 deletions core/css/apps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,7 @@ em {
}
> span {
cursor: pointer;
white-space: nowrap;
}
> p {
width: 150px;
Expand Down
9 changes: 3 additions & 6 deletions core/css/share.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
#shareWithList {
list-style-type: none;
padding: 8px;
li {
> li {
padding-top: 10px;
padding-bottom: 10px;
font-weight: bold;
Expand All @@ -85,8 +85,8 @@
flex-shrink: 0;
position: relative;
.popovermenu {
right: -6px;
top: 40px;
right: -11px;
top: 35px;
padding: 3px 6px;
}
}
Expand All @@ -112,9 +112,6 @@
vertical-align: middle;
flex-grow: 5;
}
li label {
margin-right: 8px;
}
}

a {
Expand Down
8 changes: 4 additions & 4 deletions core/js/sharedialogshareelistview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
'<ul>' +
'{{#if isResharingAllowed}} {{#if sharePermissionPossible}} {{#unless isMailShare}}' +
'<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}}" />' +
'<label for="canShare-{{cid}}-{{shareWith}}">{{canShareLabel}}</label>' +
'</span>' +
Expand All @@ -68,23 +68,23 @@
'{{#if isFolder}}' +
'{{#if createPermissionPossible}}{{#unless isMailShare}}' +
'<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}}"/>' +
'<label for="canCreate-{{cid}}-{{shareWith}}">{{createPermissionLabel}}</label>' +
'</span>' +
'</li>' +
'{{/unless}}{{/if}}' +
'{{#if updatePermissionPossible}}{{#unless isMailShare}}' +
'<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}}"/>' +
'<label for="canUpdate-{{cid}}-{{shareWith}}">{{updatePermissionLabel}}</label>' +
'</span>' +
'</li>' +
'{{/unless}}{{/if}}' +
'{{#if deletePermissionPossible}}{{#unless isMailShare}}' +
'<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}}"/>' +
'<label for="canDelete-{{cid}}-{{shareWith}}">{{deletePermissionLabel}}</label>' +
'</span>' +
Expand Down