Merge pull request #18550 from owncloud/mobile-shared-style

fix being able to distinguish shared items on mobile

2 files changed, 9 insertions, 7 deletions

diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index dd8244a2913..635c24c4168 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -32,6 +32,12 @@ table td.filename .nametext {
 	width: 100%;
 }
 
+/* show share action of shared items darker to distinguish from non-shared */
+#fileList a.action.permanent.shared-style {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
+	filter: alpha(opacity=70) !important;
+	opacity: .7 !important;
+}
 /* always show actions on mobile, not only on hover */
 #fileList a.action,
 #fileList a.action.action-menu.permanent {
@@ -40,12 +46,6 @@ table td.filename .nametext {
 	opacity: .2 !important;
 	display: inline !important;
 }
-/* show share action of shared items darker to distinguish from non-shared */
-#fileList a.action.permanent {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
-	filter: alpha(opacity=70) !important;
-	opacity: .7 !important;
-}
 #fileList a.action.action-menu img {
 	padding-left: 2px;
 }
diff --git a/core/js/share.js b/core/js/share.js
index bf9250b3c3a..7e0d0b7a2d3 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -219,7 +219,7 @@ OC.Share={
 		return html;
 	},
 	/**
-	 * Loop over all recipients in the list and format them using 
+	 * Loop over all recipients in the list and format them using
 	 * all kind of fancy magic.
 	 *
 	 * @param {String[]} recipients array of all the recipients
@@ -249,6 +249,7 @@ OC.Share={
 		var owner = $tr.attr('data-share-owner');
 		var shareFolderIcon;
 		var image = OC.imagePath('core', 'actions/share');
+		action.removeClass('shared-style');
 		// update folder icon
 		if (type === 'dir' && (hasShares || hasLink || owner)) {
 			if (hasLink) {
@@ -265,6 +266,7 @@ OC.Share={
 		// update share action text / icon
 		if (hasShares || owner) {
 			recipients = $tr.attr('data-share-recipients');
+			action.addClass('shared-style');
 
 			message = t('core', 'Shared');
 			// even if reshared, only show "Shared by"