diff --git a/public/plural-logo-white.png b/public/plural-logo-white.png new file mode 100644 index 00000000..25bb526b Binary files /dev/null and b/public/plural-logo-white.png differ diff --git a/public/plural-logotype-white.png b/public/plural-logotype-white.png new file mode 100644 index 00000000..461a48d5 Binary files /dev/null and b/public/plural-logotype-white.png differ diff --git a/src/components/Icons.stories.tsx b/src/components/Icons.stories.tsx index e726ab95..b9f32183 100644 --- a/src/components/Icons.stories.tsx +++ b/src/components/Icons.stories.tsx @@ -42,7 +42,7 @@ import InvoicesIcon from './icons/InvoicesIcon' import KeyIcon from './icons/KeyIcon' import KeyPairIcon from './icons/KeyPairIcon' import LifePreserverIcon from './icons/LifePreserverIcon' -import LightingIcon from './icons/LightingIcon' +import LightningIcon from './icons/LightningIcon' import LinkoutIcon from './icons/LinkoutIcon' import LinksIcon from './icons/LinksIcon' import ListIcon from './icons/ListIcon' @@ -133,7 +133,7 @@ const icons = { KeyIcon, KeyPairIcon, LifePreserverIcon, - LightingIcon, + LightningIcon, LinkoutIcon, LinksIcon, ListIcon, diff --git a/src/components/icons/DiscordIcon.tsx b/src/components/icons/DiscordIcon.tsx index 4ed967c6..90dd2ed6 100644 --- a/src/components/icons/DiscordIcon.tsx +++ b/src/components/icons/DiscordIcon.tsx @@ -7,11 +7,9 @@ export default createIcon(({ size, color }) => ( 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: [ {