diff options
author | Julius Härtl <jus@bitgrid.net> | 2019-01-31 11:22:46 +0100 |
---|---|---|
committer | Julius Härtl <jus@bitgrid.net> | 2019-03-01 20:56:18 +0100 |
commit | 31340b8be944fbf86237c10bff87b5ca3a2ffa8a (patch) | |
tree | 5cf05f44970b5fd71e4fe4883d2050649f313002 /core | |
parent | d1a4856b5dbc2d9fc19d203c640a3c01a64a1fe8 (diff) | |
download | nextcloud-server-31340b8be944fbf86237c10bff87b5ca3a2ffa8a.tar.gz nextcloud-server-31340b8be944fbf86237c10bff87b5ca3a2ffa8a.zip |
Add icon for resource type and icons for folder/file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core')
-rw-r--r-- | core/css/icons.scss | 4 | ||||
-rw-r--r-- | core/src/OCP/collaboration.js | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/css/icons.scss b/core/css/icons.scss index 9a950017091..d1d3d91094f 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -384,6 +384,10 @@ img, object, video, button, textarea, input, select, div[contenteditable='true'] @include icon-color('text', 'filetypes', $color-black, 1, true); } +.icon-filetype-file { + @include icon-color('file', 'filetypes', $color-black, 1, true); +} + @include icon-black-white('folder', 'filetypes', 1, true); .icon-filetype-folder { @include icon-color('folder', 'filetypes', $color-black, 1, true); diff --git a/core/src/OCP/collaboration.js b/core/src/OCP/collaboration.js index 54b580406ed..96a20bffc9c 100644 --- a/core/src/OCP/collaboration.js +++ b/core/src/OCP/collaboration.js @@ -49,7 +49,7 @@ export default { return Object.keys(types); }, getIcon(type) { - return types[type].icon || ''; + return types[type].typeIconClass || ''; }, getLabel(type) { return t('files_sharing', 'Link to a {label}', { label: types[type].typeString || type }, 1) |