From 13723ebfef124fbbb9cfa2b86f03f76f6d3f4a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=A9rault?= Date: Thu, 19 May 2022 21:32:46 +0300 Subject: [PATCH] Import images and icons --- public/plural-logo-white.png | Bin 0 -> 414 bytes public/plural-logotype-white.png | Bin 0 -> 824 bytes src/components/Icons.stories.tsx | 4 +- src/components/icons/DiscordIcon.tsx | 10 ++- src/components/icons/GitHubLogoIcon.tsx | 65 ++++++++++-------- .../icons/HamburgerMenuCollapseIcon.tsx | 33 +++++++++ src/components/icons/HamburgerMenuIcon.tsx | 6 +- .../{LightingIcon.tsx => LightningIcon.tsx} | 0 src/components/icons/TwitterIcon.tsx | 10 ++- src/theme.tsx | 32 ++++----- 10 files changed, 95 insertions(+), 65 deletions(-) create mode 100644 public/plural-logo-white.png create mode 100644 public/plural-logotype-white.png create mode 100644 src/components/icons/HamburgerMenuCollapseIcon.tsx rename src/components/icons/{LightingIcon.tsx => LightningIcon.tsx} (100%) diff --git a/public/plural-logo-white.png b/public/plural-logo-white.png new file mode 100644 index 0000000000000000000000000000000000000000..25bb526b289e0cad4b0e24a592dad08910c7684d GIT binary patch literal 414 zcmV;P0b%}$P)b|Ke+>!7!sPgB0VN2vbMP3G680XZ9Pah`(4*Ec~S?o~*mK)TQOJA!2 z2YP1sqb`i*w*DnJz=0|Zm1L6@`P_#iP6mdNgeN;Wt`~4h zP8lBI&aIaL(FUK$z(^b07*qo IM6N<$f*q2g761SM literal 0 HcmV?d00001 diff --git a/public/plural-logotype-white.png b/public/plural-logotype-white.png new file mode 100644 index 0000000000000000000000000000000000000000..461a48d557e1cf3f5d2670b235a253d7a64dd76f GIT binary patch literal 824 zcmV-81IPS{P)e3&*yv1xuI%I3`*WY^|k;9*bh3v!D@o> z+X*&XZCzbm_1fMb^TENvMwx5>CdmypS#pT21DpW9fq?<9j(1nwRG0iM4t=Hh(r+bG z=}L%GI-P!KBfM4Y~KSSua>P**_&+a-(7bq>>rEwE6Ma)oi~w~#Fh zWP30WbEz3L?RJG6^U)NuX#M4-IZeCQAYU{>KA$&c=X~%@Dq#xueJ@-0zaVF3N+ytI@Yg! z8o>8TUBXTP+g%-d%0lW`u~ ( fill="none" xmlns="http://www.w3.org/2000/svg" > - - - + )) diff --git a/src/components/icons/GitHubLogoIcon.tsx b/src/components/icons/GitHubLogoIcon.tsx index c787b7f1..ace7f11d 100644 --- a/src/components/icons/GitHubLogoIcon.tsx +++ b/src/components/icons/GitHubLogoIcon.tsx @@ -1,38 +1,45 @@ import createIcon from './createIcon' -export default createIcon(({ size }) => ( +export default createIcon(({ size, color }) => ( - - - - - - - + + + + + + + + )) diff --git a/src/components/icons/HamburgerMenuCollapseIcon.tsx b/src/components/icons/HamburgerMenuCollapseIcon.tsx new file mode 100644 index 00000000..c42f62cb --- /dev/null +++ b/src/components/icons/HamburgerMenuCollapseIcon.tsx @@ -0,0 +1,33 @@ +import createIcon from './createIcon' + +export default createIcon(({ size, color }) => ( + + + + + + +)) diff --git a/src/components/icons/HamburgerMenuIcon.tsx b/src/components/icons/HamburgerMenuIcon.tsx index af2f846c..2887f132 100644 --- a/src/components/icons/HamburgerMenuIcon.tsx +++ b/src/components/icons/HamburgerMenuIcon.tsx @@ -8,19 +8,19 @@ export default createIcon(({ size, color }) => ( xmlns="http://www.w3.org/2000/svg" > ( fill="none" xmlns="http://www.w3.org/2000/svg" > - - - + )) diff --git a/src/theme.tsx b/src/theme.tsx index d20610fa..45588c6d 100644 --- a/src/theme.tsx +++ b/src/theme.tsx @@ -80,15 +80,20 @@ export default mergeTheme(defaultTheme, { name: 'plural', mode: 'dark', colors: { + blue, + grey, + success, + warning, + error, primary: '#293EFF', secondary: '#222534', background: { light: 'white', - dark: '#171A21', + dark: 'grey.900', }, 'background-light': { light: '#F5F5F5', - dark: '#2A2E37', + dark: 'grey.800', }, 'background-middle': { light: '#EEEEEE', @@ -99,41 +104,30 @@ export default mergeTheme(defaultTheme, { dark: '#323643', }, // text has already been declared by the default theme + text: { + light: 'black', + dark: 'grey.50', + }, 'text-strong': { light: '#000000', dark: 'white', }, 'text-light': { light: '#444444', - dark: '#C4CAD4', + dark: 'grey.200', }, 'text-xlight': { light: '#666666', - dark: '#999999', + dark: 'grey.300', }, border: { light: '#CCCCCC', dark: '#303340', }, - success: '#07E5A7', - warning: '#EF931D', - error: '#E03E43', 'background-success': '#07E5A733', 'background-warning': '#EF931D66', 'background-error': '#E03E4366', 'background-info': '#0190C266', - 'accent-blue': { - dark: '#0190C2', - light: '#0190C2', - }, - 'accent-purple': { - dark: '#9510A1', - light: '#9510A1', - }, - 'accent-green': { - dark: '#058E4B', - light: '#058E4B', - }, }, html: [ {