CipherLabs
/
permissioning-smart-contracts
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated colors and images (#185)

Browse Source 
* updated colors and images

Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
pull/186/head
Sally MacFarlane 4 years ago committed by GitHub
parent b66c431719
commit 07b0fcd7bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 41 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      public/index.html
  2. 2
      public/manifest.json
  3. BIN
      public/pegasys-logo.png
  4. BIN
      public/quorum-avatar.png
  5. 24
      src/__test__/__snapshots__/App.test.tsx.snap
  6. 2
      src/components/AccountTab/TableHeader.tsx
  7. 2
      src/components/AdminTab/TableHeader.tsx
  8. 2
      src/components/EnodeTab/TableHeader.tsx
  9. BIN
      src/components/Footer/QuorumLogo_Blue.png
  10. BIN
      src/components/Footer/created-by-pegasys.png
  11. 4
      src/components/Footer/index.tsx
  12. 2
      src/components/Footer/styles.module.scss
  13. 2
      src/components/Modals/Add.tsx
  14. 24
      src/constants/colors.ts
  15. 16
      src/constants/theme.ts

2
public/index.html
Unescape View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/pegasys-logo.png" /> <link rel="shortcut icon" href="%PUBLIC_URL%/quorum-avatar.png" />
<meta <meta
name="viewport" name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no" content="width=device-width, initial-scale=1, shrink-to-fit=no"

2
public/manifest.json
Unescape View File

@ -3,7 +3,7 @@
"name": "Create React App Sample", "name": "Create React App Sample",
"icons": [ "icons": [
{ {
"src": "pegasys-logo.png", "src": "quorum-avatar.png",
"sizes": "64x64 32x32 24x24 16x16", "sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon" "type": "image/x-icon"
} }

BIN
public/pegasys-logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
public/quorum-avatar.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

24
src/__test__/__snapshots__/App.test.tsx.snap
Unescape View File

@ -39,14 +39,14 @@ exports[`<App /> matches snapshot 1`] = `
"--main-color": "#DC2C10", "--main-color": "#DC2C10",
}, },
"primary": Object { "primary": Object {
"--contrast-color": "#000", "--contrast-color": "#fff",
"--main-color": "#25D78F", "--main-color": "#2C56DD",
"backgroundColor": "#25D78F", "backgroundColor": "#2C56DD",
"color": "#000", "color": "#fff",
}, },
"success": Object { "success": Object {
"--contrast-color": "#FFF", "--contrast-color": "#FFF",
"--main-color": "#28C081", "--main-color": "#01D49A",
}, },
}, },
"colors": Object { "colors": Object {
@ -65,7 +65,7 @@ exports[`<App /> matches snapshot 1`] = `
"rgba(0,0,0,.8)", "rgba(0,0,0,.8)",
"rgba(0,0,0,.9)", "rgba(0,0,0,.9)",
], ],
"blue": "#3259D6", "blue": "#2C56DD",
"copyColor": "#3F3D4B", "copyColor": "#3F3D4B",
"dark-gray": "#333", "dark-gray": "#333",
"grey": "#CCC", "grey": "#CCC",
@ -75,9 +75,9 @@ exports[`<App /> matches snapshot 1`] = `
"moon-gray": "#ccc", "moon-gray": "#ccc",
"near-black": "#111", "near-black": "#111",
"near-white": "#f4f4f4", "near-white": "#f4f4f4",
"primary": "#25D78F", "primary": "#2C56DD",
"primary-dark": "#1dac72", "primary-dark": "#2344b0",
"primary-light": "#50dfa5", "primary-light": "#5677e3",
"silver": "#999", "silver": "#999",
"transparent": "transparent", "transparent": "transparent",
"white": "#fff", "white": "#fff",
@ -174,9 +174,9 @@ exports[`<App /> matches snapshot 1`] = `
"color": "#206790", "color": "#206790",
}, },
"success": Object { "success": Object {
"backgroundColor": "#e9f8f2", "backgroundColor": "#e5faf4",
"borderColor": "#28C081", "borderColor": "#01D49A",
"color": "#18734d", "color": "#007f5c",
}, },
"warning": Object { "warning": Object {
"backgroundColor": "#fef5e9", "backgroundColor": "#fef5e9",

2
src/components/AccountTab/TableHeader.tsx
Unescape View File

@ -16,7 +16,7 @@ const TableHeader: React.FC<TableHeader> = ({ number, openAddModal, disabledAdd
<Heading.h2 fontWeight="700">Accounts ({number})</Heading.h2> <Heading.h2 fontWeight="700">Accounts ({number})</Heading.h2>
</Box> </Box>
<Flex alignItems="center"> <Flex alignItems="center">
<Button icon="AddCircleOutline" mainColor="#25D78F" onClick={() => openAddModal()} disabled={disabledAdd}> <Button icon="AddCircleOutline" onClick={() => openAddModal()} disabled={disabledAdd}>
Add Account Add Account
</Button> </Button>
</Flex> </Flex>

2
src/components/AdminTab/TableHeader.tsx
Unescape View File

@ -16,7 +16,7 @@ const TableHeader: React.FC<TableHeader> = ({ number, openAddModal, disabledAdd
<Heading.h2 fontWeight="700">Admins ({number})</Heading.h2> <Heading.h2 fontWeight="700">Admins ({number})</Heading.h2>
</Box> </Box>
<Flex alignItems="center"> <Flex alignItems="center">
<Button icon="AddCircleOutline" mainColor="#25D78F" onClick={() => openAddModal()} disabled={disabledAdd}> <Button icon="AddCircleOutline" onClick={() => openAddModal()} disabled={disabledAdd}>
Add Admin Add Admin
</Button> </Button>
</Flex> </Flex>

2
src/components/EnodeTab/TableHeader.tsx
Unescape View File

@ -16,7 +16,7 @@ const TableHeader: React.FC<TableHeader> = ({ number, openAddModal, disabledAdd
<Heading.h2 fontWeight="700">Nodes ({number})</Heading.h2> <Heading.h2 fontWeight="700">Nodes ({number})</Heading.h2>
</Box> </Box>
<Flex alignItems="center"> <Flex alignItems="center">
<Button icon="AddCircleOutline" mainColor="#25D78F" onClick={() => openAddModal()} disabled={disabledAdd}> <Button icon="AddCircleOutline" onClick={() => openAddModal()} disabled={disabledAdd}>
Add Node Add Node
</Button> </Button>
</Flex> </Flex>

BIN
src/components/Footer/QuorumLogo_Blue.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
src/components/Footer/created-by-pegasys.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

4
src/components/Footer/index.tsx
Unescape View File

@ -5,8 +5,8 @@ import styles from './styles.module.scss';
const Footer: React.FC<{}> = () => { const Footer: React.FC<{}> = () => {
return ( return (
<Flex> <Flex>
<a href="http://www.pegasys.tech" target="_blank" rel="noopener noreferrer" className={styles.footerLogo}> <a href="https://consensys.net/quorum" target="_blank" rel="noopener noreferrer" className={styles.footerLogo}>
Created by PegaSys Created by ConsenSys
</a> </a>
</Flex> </Flex>
); );

2
src/components/Footer/styles.module.scss
Unescape View File

@ -1,5 +1,5 @@
.footerLogo { .footerLogo {
background-image: url(created-by-pegasys.png); background-image: url(QuorumLogo_Blue.png);
display: block; display: block;
background-size: contain; background-size: contain;
font-size: 0px; font-size: 0px;

2
src/components/Modals/Add.tsx
Unescape View File

@ -69,7 +69,7 @@ const AddModal: React.FC<{
type="submit" type="submit"
ml={3} ml={3}
color="white" color="white"
bg="pegasys" bg="protocol"
hovercolor="#25D78F" hovercolor="#25D78F"
border={1} border={1}
onClick={handleSubmit} onClick={handleSubmit}

24
src/constants/colors.ts
Unescape View File

@ -2,24 +2,24 @@ import { tint, shade, readableColor } from 'polished';
// rimble base colors // rimble base colors
const baseColors = { const baseColors = {
black: '#000', black: '#202328',
white: '#FFF', white: '#FFF',
blue: '#36ADF1', blue: '#36ADF1',
green: '#28C081', green: '#01D49A',
yellow: '#FD9D28', yellow: '#FD9D28',
red: '#DC2C10', red: '#DC2C10',
blurple: '#4E3FCE', blurple: '#CCD8E1',
consensysblue: '#3259D6', consensysblue: '#2C56DD',
pegasys: '#25D78F' protocol: '#2C56DD'
}; };
// rimble palette // rimble palette
const colors = { const colors = {
pegasys: { protocol: {
base: baseColors.pegasys, base: baseColors.protocol,
text: readableColor(baseColors.pegasys), text: readableColor(baseColors.protocol),
light: [null, tint(0.2, baseColors.pegasys)], light: [null, tint(0.2, baseColors.protocol)],
dark: [null, shade(0.2, baseColors.pegasys)] dark: [null, shade(0.2, baseColors.protocol)]
}, },
blurple: { blurple: {
base: baseColors.blurple, base: baseColors.blurple,
@ -53,14 +53,14 @@ const colors = {
} }
}; };
const pegasys = colors.pegasys; const protocol = colors.protocol;
const blurple = colors.blurple; const blurple = colors.blurple;
const blue = colors.blue; const blue = colors.blue;
const green = colors.green; const green = colors.green;
const yellow = colors.yellow; const yellow = colors.yellow;
const red = colors.red; const red = colors.red;
export { pegasys }; export { protocol };
export { blurple }; export { blurple };
export { blue }; export { blue };
export { green }; export { green };

16
src/constants/theme.ts
Unescape View File

@ -1,6 +1,6 @@
import { tint, shade } from 'polished'; import { tint, shade } from 'polished';
import baseColors, { pegasys, blue, green, yellow, red } from './colors'; import baseColors, { protocol, blue, green, yellow, red } from './colors';
// theme.js // theme.js
export default { export default {
@ -31,9 +31,9 @@ export default {
disabled: 0.4 disabled: 0.4
}, },
colors: { colors: {
primary: pegasys.base, primary: protocol.base,
'primary-light': pegasys.light[1], 'primary-light': protocol.light[1],
'primary-dark': pegasys.dark[1], 'primary-dark': protocol.dark[1],
blue: baseColors.consensysblue, blue: baseColors.consensysblue,
copyColor: '#3F3D4B', copyColor: '#3F3D4B',
// black: '#000', // black: '#000',
@ -109,11 +109,11 @@ export default {
}, },
buttons: { buttons: {
primary: { primary: {
color: pegasys.text, color: protocol.text,
backgroundColor: pegasys.base, backgroundColor: protocol.base,
// use css custom props // use css custom props
'--main-color': pegasys.base, '--main-color': protocol.base,
'--contrast-color': pegasys.text '--contrast-color': protocol.text
}, },
success: { success: {
'--main-color': green.base, '--main-color': green.base,

Write Preview
Loading…
Cancel
Save