Browse Source
Merge pull request #34181 from nextcloud/enh/edit-locally-icon
Use computer icon for edit locally file action
pull/34183/head
Vincent Petry
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with
18 additions and
6 deletions
-
apps/files/css/files.css
-
apps/files/css/files.css.map
-
apps/files/css/files.scss
-
apps/files/css/merged.css
-
apps/files/css/merged.css.map
-
apps/files/img/computer.svg
-
apps/files/js/fileactions.js
-
apps/files/js/filelist.js
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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> |
|
|
|
@ -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, |
|
|
|
|
|
|
|
@ -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; |
|
|
|
}, |
|
|
|
|