summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMarius Blüm <marius@lineone.io>2016-10-30 11:27:57 +0100
committerGitHub <noreply@github.com>2016-10-30 11:27:57 +0100
commita08a4b5981b0c5eb41f50caf4c33effb57b397eb (patch)
treec2f92c0c1efb226e02d214086ece20f456b449dc /core
parent1187a8c18373935b72ee577d993d4d9037a2de7a (diff)
parent2d91831b5092c9d04a20cbe55a31cc41cec10fbe (diff)
downloadnextcloud-server-a08a4b5981b0c5eb41f50caf4c33effb57b397eb.tar.gz
nextcloud-server-a08a4b5981b0c5eb41f50caf4c33effb57b397eb.zip
Merge pull request #1955 from nextcloud/issue_#1776
Issue-1776: Add unshare function to 3-dot menu.
Diffstat (limited to 'core')
-rw-r--r--core/css/share.css5
-rw-r--r--core/js/sharedialogshareelistview.js6
2 files changed, 7 insertions, 4 deletions
diff --git a/core/css/share.css b/core/css/share.css
index 042c4ddf2ae..b2c47608933 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -78,11 +78,12 @@
#shareWithList .sharingOptionsGroup {
position: absolute;
- right: 0;
+ right: 15px;
}
#shareWithList .sharingOptionsGroup .popovermenu {
- right: 44px;
+ right: -22px;
+ top: 30px;
}
#shareWithList .shareOption {
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 9b0d9c8c50e..66ed85eda33 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -69,10 +69,12 @@
'</li>' +
'{{/if}}' +
'{{/if}}' +
+ '<li>' +
+ '<a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span>{{unshareLabel}}</span></a>' +
+ '</li>' +
'</ul>' +
'</div>' +
- '<a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually">{{unshareLabel}}</span></a>' +
- '</span>' +
+ '</span>' +
'</li>' +
'{{/each}}' +
'{{#each linkReshares}}' +