diff options
| -rw-r--r-- | apps/files_sharing/css/sharetabview.scss | 13 | ||||
| -rw-r--r-- | core/css/share.scss | 20 | ||||
| -rw-r--r-- | core/js/tests/specs/sharedialogshareelistview.js | 14 |
3 files changed, 3 insertions, 44 deletions
diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss index 880226e7d14..4d07e547e86 100644 --- a/apps/files_sharing/css/sharetabview.scss +++ b/apps/files_sharing/css/sharetabview.scss @@ -79,24 +79,16 @@ align-items: center; } -#shareWithList .unshare img, #shareWithList .showCruds img { +#shareWithList .unshare img { vertical-align: text-bottom; /* properly align icons */ } -#shareWithList .sharingOptionsGroup .icon-more { +#shareWithList .sharingOptionsGroup > a .icon { padding: 7px; vertical-align: middle; opacity: .5; } -#shareWithList .unshare { - padding: 1px 6px; - vertical-align: text-bottom; -} -#shareWithList .unshare .icon { - vertical-align: text-top; -} - #shareWithList .sharingOptionsGroup .popovermenu:after { right: 3px; } @@ -122,7 +114,6 @@ .shareTabView .icon-loading-small { display: inline-block; z-index: 1; - margin-right: 4px; vertical-align: text-top; } 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); - }); }); }); |