[ARVADOS-WORKBENCH2] updated: 2.1.0-174-g90e5ed1b

[Git user]

Summary of changes:
 src/components/icon/icon.tsx |  3 ++-
 src/components/tree/tree.tsx | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

       via  90e5ed1bcd066cddd05fb7e1e18071f78b539a12 (commit)
       via  7d8d59bec8ca673c800b679637218ef77813a93c (commit)
       via  534df712c4cfc3f6574dee1f4906bb7f6cc70be9 (commit)
      from  d33e5d82e3cd5c51b2b6a5e4c35f2c773da9b0fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 90e5ed1bcd066cddd05fb7e1e18071f78b539a12
Merge: d33e5d82 7d8d59be
Author: Daniel Kutyła <daniel.kutyla at contractors.roche.com>
Date:   Mon Jan 25 21:27:34 2021 +0100

    Merge branch '17264-Files-in-file-picker-have-wrong-icon'
    closes #17264
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla at contractors.roche.com>


commit 7d8d59bec8ca673c800b679637218ef77813a93c
Author: Daniel Kutyła <daniel.kutyla at contractors.roche.com>
Date:   Mon Jan 25 21:23:34 2021 +0100

    17264: Replaced file icon with new one
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla at contractors.roche.com>

diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx
index bceee504..9eb60332 100644
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@ -10,6 +10,7 @@ import ArrowDropDown from '@material-ui/icons/ArrowDropDown';
 import BubbleChart from '@material-ui/icons/BubbleChart';
 import Build from '@material-ui/icons/Build';
 import Cached from '@material-ui/icons/Cached';
+import DescriptionIcon from '@material-ui/icons/Description';
 import ChevronLeft from '@material-ui/icons/ChevronLeft';
 import CloudUpload from '@material-ui/icons/CloudUpload';
 import Code from '@material-ui/icons/Code';
@@ -106,7 +107,7 @@ export const EditSavedQueryIcon: IconType = (props) => <Create {...props} />;
 export const ExpandIcon: IconType = (props) => <ExpandMoreIcon {...props} />;
 export const ErrorIcon: IconType = (props) => <ErrorRoundedIcon style={{ color: '#ff0000' }} {...props} />;
 export const FavoriteIcon: IconType = (props) => <Star {...props} />;
-export const FileIcon: IconType = (props) => <LibraryBooks {...props} />;
+export const FileIcon: IconType = (props) => <DescriptionIcon {...props} />;
 export const HelpIcon: IconType = (props) => <Help {...props} />;
 export const HelpOutlineIcon: IconType = (props) => <HelpOutline {...props} />;
 export const ImportContactsIcon: IconType = (props) => <ImportContacts {...props} />;

-----------------------------------------------------------------------


hooks/post-receive
--