From ba57f2c8014d1471ca10f23ffe2521a9c8c7870c Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Fri, 20 Mar 2020 22:08:56 +0100 Subject: [PATCH] pdf icons & color Signed-off-by: Virginie Ky --- packages/strapi-admin/admin/src/themes/colors.js | 10 +--------- .../admin/src/components/FileIcon/Wrapper.js | 7 ++++--- .../admin/src/components/FileIcon/index.js | 6 +++--- .../src/components/FileIcon/utils/extensions.json | 5 +---- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/packages/strapi-admin/admin/src/themes/colors.js b/packages/strapi-admin/admin/src/themes/colors.js index 57b18b0467..41949e90f5 100644 --- a/packages/strapi-admin/admin/src/themes/colors.js +++ b/packages/strapi-admin/admin/src/themes/colors.js @@ -3,6 +3,7 @@ const colors = { white: '#ffffff', red: '#ff203c', orange: '#ff5d00', + lightOrange: '#f64d0a', yellow: '#ffd500', green: '#27b70f', blue: '#0097f7', @@ -26,15 +27,6 @@ const colors = { lightBlue: '#E6F0FB', mediumBlue: '#007EFF', darkBlue: '#AED4FB', - - // Specific to file icons - file: { - archive: '#715A31', - code: '#515A6D', - default: '#BDBFC2', - pdf: '#E26D6D', - }, - content: { background: '#fafafb', 'background-alpha': 'rgba(14, 22, 34, 0.02)', diff --git a/packages/strapi-plugin-upload/admin/src/components/FileIcon/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/FileIcon/Wrapper.js index 86f626110e..475a330bee 100644 --- a/packages/strapi-plugin-upload/admin/src/components/FileIcon/Wrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/FileIcon/Wrapper.js @@ -4,15 +4,16 @@ import { themePropTypes } from 'strapi-helper-plugin'; const Wrapper = styled.div` font-size: 54px; - color: ${({ theme, icon }) => theme.main.colors.file[icon]}; + color: ${({ theme, colored }) => + colored ? theme.main.colors.lightOrange : theme.main.colors.grey}; `; Wrapper.defaultProps = { - icon: 'default', + colored: false, }; Wrapper.propTypes = { - icon: PropTypes.string, + colored: PropTypes.bool, ...themePropTypes, }; diff --git a/packages/strapi-plugin-upload/admin/src/components/FileIcon/index.js b/packages/strapi-plugin-upload/admin/src/components/FileIcon/index.js index df65484a40..d95bd3592d 100644 --- a/packages/strapi-plugin-upload/admin/src/components/FileIcon/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/FileIcon/index.js @@ -13,17 +13,17 @@ import extensions from './utils/extensions.json'; import Wrapper from './Wrapper'; const FileIcon = ({ ext }) => { - const iconName = Object.keys(extensions).find(key => extensions[key].includes(ext)); + const iconName = Object.keys(extensions).find(key => extensions[key].includes(ext)) || 'alt'; return ( - + ); }; FileIcon.defaultProps = { - ext: 'zip', + ext: 'alt', }; FileIcon.propTypes = { diff --git a/packages/strapi-plugin-upload/admin/src/components/FileIcon/utils/extensions.json b/packages/strapi-plugin-upload/admin/src/components/FileIcon/utils/extensions.json index aa85dd5b64..34b158e876 100644 --- a/packages/strapi-plugin-upload/admin/src/components/FileIcon/utils/extensions.json +++ b/packages/strapi-plugin-upload/admin/src/components/FileIcon/utils/extensions.json @@ -1,7 +1,4 @@ { "archive": ["rar", "tar", "zip"], - "code": ["js", "json", "rb", "erb", "txt", "css", "scss", "html", "jsx", "svg"], - "pdf": ["pdf"], - "powerpoint": ["ppt", "key", "xls"], - "word": ["doc", "docx", "pages"] + "pdf": ["pdf"] }