Fixed sharing popover and removed unused old code

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Nov 7, 2017 · d21356e · d21356e
1 parent bce00d8
commit d21356e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 43 deletions.
diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
@@ -83,20 +83,12 @@
 	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
@@ -104,16 +104,14 @@
 		.popovermenu {
 			right: -11px;
 			top: 35px;
-			padding: 3px 6px;
 		}
 	}
 
 	.shareOption {
 		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
@@ -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);
-		});
 	});
 
 });