Skip to content

[stable20] Bring back the restore share button #23636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Oct 25, 2020
Merged

[stable20] Bring back the restore share button #23636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Bring back the restore share button 
Fix disabled default file action to still use an anchor element, as this
is used in many other places (and potentially apps).

Adjusted anchor style to not look like it's clickable and added extras
to make sure everything inside still looks clickable as before.

Signed-off-by: Vincent Petry <[email protected]>
  • Loading branch information
@PVince81 @backportbot
PVince81 authored and backportbot[bot] committed Oct 22, 2020
commit d391e7fe02bf123d53ccb28f615fb1091f74038f
17 changes: 17 additions & 0 deletions apps/files/css/files.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,23 @@ table td.selection {
cursor: default !important;
}

/*
* Make the disabled link look not like a link in file list rows
*/
#fileList a.name.disabled {
* {
cursor: default;
}

a, a * {
cursor: pointer;
}

&:focus {
background: none;
}
}

a.action > img {
height: 16px;
width: 16px;
Expand Down
4 changes: 1 addition & 3 deletions apps/files/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,9 +1561,7 @@
"href": linkUrl
});
if (this._defaultFileActionsDisabled) {
linkElem = $('<p></p>').attr({
"class": "name"
})
linkElem.addClass('disabled');
}

linkElem.append('<div class="thumbnail-wrapper"><div class="thumbnail" style="background-image:url(' + icon + ');"></div></div>');
Expand Down