upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-23 01:40:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 28

Merge pull request #34181 from nextcloud/enh/edit-locally-icon

Browse source 
Use computer icon for edit locally file action
This commit is contained in:
Vincent Petry 2022-09-22 10:22:10 +02:00 committed by GitHub
commit e346417067
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files/css/files.css
View file

@ -703,6 +703,10 @@ a.action > img {
vertical-align: text-bottom;
}
a.action.action-editlocally img.icon {
filter: var(--background-invert-if-dark);
}
/* Actions for selected files */
.selectedActions {
position: relative;

2
apps/files/css/files.css.map
View file

File diff suppressed because one or more lines are too long

5
apps/files/css/files.scss
View file

@ -596,6 +596,10 @@ a.action > img {
vertical-align: text-bottom;
}
a.action.action-editlocally img.icon {
filter: var(--background-invert-if-dark);
}
/* Actions for selected files */
.selectedActions {
position: relative;
@ -1311,4 +1315,3 @@ table.dragshadow td.size {
margin: 0 12px;
}
}

4
apps/files/css/merged.css
View file

@ -703,6 +703,10 @@ a.action > img {
vertical-align: text-bottom;
}
a.action.action-editlocally img.icon {
filter: var(--background-invert-if-dark);
}
/* Actions for selected files */
.selectedActions {
position: relative;

2
apps/files/css/merged.css.map
View file

File diff suppressed because one or more lines are too long

1
apps/files/img/computer.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M20 18c1.1 0 1.99-.9 1.99-2L22 6c0-1.1-.9-2-2-2H4c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2H1c-.55 0-1 .45-1 1s.45 1 1 1h22c.55 0 1-.45 1-1s-.45-1-1-1h-3zM5 6h14c.55 0 1 .45 1 1v8c0 .55-.45 1-1 1H5c-.55 0-1-.45-1-1V7c0-.55.45-1 1-1z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 344 B

4
apps/files/js/fileactions.js
View file

@ -720,10 +720,10 @@
},
mime: 'all',
order: -23,
iconClass: function(filename, context) {
icon: function(filename, context) {
var locked = context.$file.data('locked');
if (!locked) {
return 'icon-rename';
return OC.imagePath('files', 'computer.svg')
}
},
permissions: OC.PERMISSION_UPDATE,

2
apps/files/js/filelist.js
View file

@ -2811,7 +2811,7 @@
var scheme = 'nc://';
var command = 'open';
var uid = OC.getCurrentUser().uid;
var url = scheme + command + '/' + uid + '@' + window.location.host + (window.location.port ? `:${window.location.port}` : '') + OC.encodePath(path);
var url = scheme + command + '/' + uid + '@' + window.location.host + OC.encodePath(path);
window.location.href = url;
},