mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

fix being able to distinguish shared items on mobile
This commit is contained in:
Jan-Christoph Borchardt 2015-08-25 17:08:34 +02:00
parent 1efbc99365 cc898cf346
commit a262be5141
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files/css/mobile.css
View File

@ -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;
}

4
core/js/share.js
View File

@ -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"