From 2d91831b5092c9d04a20cbe55a31cc41cec10fbe Mon Sep 17 00:00:00 2001
From: Julia Bode <julia.bode@lulisaur.us>
Date: Sat, 29 Oct 2016 16:32:15 +0200
Subject: [PATCH] Issue-1776: Add unshare function to 3-dot menu.
Signed-off-by: Julia Bode <julia.bode@lulisaur.us>
---
apps/files_sharing/css/sharetabview.css | 8 ++++++--
core/css/share.css | 5 +++--
core/js/sharedialogshareelistview.js | 6 ++++--
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 9592250a7a8..1de0cc7c75d 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -62,9 +62,13 @@
vertical-align: sub;
}
+#shareWithList .unshare {
+ padding: 0;
+}
+
#shareWithList .unshare .icon-delete {
- padding-left: 15px;
- padding-right: 15px;
+ padding-right: 4px;
+ background-position-x: 0;
}
#shareWithList label input[type=checkbox]{
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}}' +
--
GitLab