summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-11-07 18:04:07 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-11-07 18:20:59 +0100
commitb44581e15d198e91c9bf947cd05afdbd559a7b30 (patch)
tree4304392c8b41207bb895e8e0479a5a5b2a6ac474 /core
parentbce00d8b3d89494b7137b75dff8a4705eecdf52b (diff)
downloadnextcloud-server-b44581e15d198e91c9bf947cd05afdbd559a7b30.tar.gz
nextcloud-server-b44581e15d198e91c9bf947cd05afdbd559a7b30.zip
Fixed sharing popover and removed unused old code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core')
-rw-r--r--core/css/share.scss20
-rw-r--r--core/js/tests/specs/sharedialogshareelistview.js14
2 files changed, 1 insertions, 33 deletions
diff --git a/core/css/share.scss b/core/css/share.scss
index 2a9f357bc38..37217fa926a 100644
--- a/core/css/share.scss
+++ b/core/css/share.scss
@@ -104,7 +104,6 @@
.popovermenu {
right: -11px;
top: 35px;
- padding: 3px 6px;
}
}
@@ -112,8 +111,7 @@
white-space: nowrap;
display: inline-block;
}
- .unshare img,
- .showCruds img {
+ .unshare img {
vertical-align: text-bottom;
/* properly align icons */
}
@@ -132,22 +130,6 @@
}
}
-a {
- &.showCruds {
- display: inline;
- opacity: .5;
- }
- &.unshare {
- display: inline-block;
- opacity: .5;
- padding: 10px;
- }
- &.showCruds:hover,
- &.unshare:hover {
- opacity: 1;
- }
-}
-
#link {
border-top: 1px solid nc-darken($color-main-background, 14%);
padding-top: 8px;
diff --git a/core/js/tests/specs/sharedialogshareelistview.js b/core/js/tests/specs/sharedialogshareelistview.js
index bcc596a1386..1d8552f0527 100644
--- a/core/js/tests/specs/sharedialogshareelistview.js
+++ b/core/js/tests/specs/sharedialogshareelistview.js
@@ -123,20 +123,6 @@ describe('OC.Share.ShareDialogShareeListView', function () {
expect(listView.$el.find("input[name='edit']").is(':checked')).toEqual(true);
expect(updateShareStub.calledOnce).toEqual(true);
});
-
- it('shows cruds checkboxes when toggled', function () {
- shareModel.set('shares', [{
- id: 100,
- item_source: 123,
- permissions: 1,
- share_type: OC.Share.SHARE_TYPE_USER,
- share_with: 'user1',
- share_with_displayname: 'User One'
- }]);
- listView.render();
- listView.$el.find('a.showCruds').click();
- expect(listView.$el.find('li.cruds').hasClass('hidden')).toEqual(false);
- });
});
});