Issue-1776: Add unshare function to 3-dot menu.

Signed-off-by: Julia Bode <julia.bode@lulisaur.us>

diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 9592250a7a8145100b129be46565ef99a4b075fd..1de0cc7c75d9c979a20f168a0b5124aa5a1bdc55 100644 (file)
--- 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 042c4ddf2aeca7e762848d385a8dff18f63cc24e..b2c47608933d9012cab7d149f27d7ec5d1472728 100644 (file)
--- 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 9b0d9c8c50eb5385273dd556270ac95bf801731e..66ed85eda33f78414e4a3c6c63ac136488250065 100644 (file)
--- 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}}' +