Skip to content
This repository has been archived by the owner on Nov 10, 2023. It is now read-only.

Commit

Permalink
Merge pull request #157 from gnosis/140-rebranding
Browse files Browse the repository at this point in the history
Feature #140: Rebranding
  • Loading branch information
mmv08 authored Sep 6, 2019
2 parents 494dd70 + 59a6fdd commit 88e37d5
Show file tree
Hide file tree
Showing 85 changed files with 1,334 additions and 1,061 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
}
],
"react/require-default-props": 0,
"react/no-array-index-key": 0
"react/no-array-index-key": 0,
"react/jsx-props-no-spreading": 0
},
"env": {
"jest/globals": true,
Expand Down
2 changes: 0 additions & 2 deletions .storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,500" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,500,700" rel="stylesheet">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
1 change: 1 addition & 0 deletions config/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ module.exports = {
},
],
},
{ test: /\.(woff|woff2)$/, loader: 'url-loader?limit=100000' },
{
test: /\.html$/,
use: [
Expand Down
1 change: 1 addition & 0 deletions config/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ module.exports = {
},
],
},
{ test: /\.(woff|woff2)$/, loader: 'url-loader?limit=100000' },
{
test: /\.(jpe?g|png|svg)$/i,
exclude: /node_modules/,
Expand Down
33 changes: 17 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
"dependencies": {
"@gnosis.pm/safe-contracts": "^1.0.0",
"@gnosis.pm/util-contracts": "2.0.1",
"@material-ui/core": "4.3.2",
"@material-ui/core": "4.4.0",
"@material-ui/icons": "4.2.1",
"@testing-library/jest-dom": "^4.0.0",
"@testing-library/jest-dom": "4.1.0",
"@welldone-software/why-did-you-render": "3.3.3",
"axios": "0.19.0",
"bignumber.js": "9.0.0",
"connected-react-router": "6.5.2",
"date-fns": "1.30.1",
"date-fns": "2.0.1",
"ethereum-ens": "^0.7.7",
"final-form": "4.18.5",
"history": "^4.7.2",
Expand All @@ -51,10 +51,10 @@
"react-dom": "16.9.0",
"react-final-form": "6.3.0",
"react-final-form-listeners": "^1.0.2",
"react-hot-loader": "4.12.11",
"react-hot-loader": "4.12.12",
"react-infinite-scroll-component": "4.5.3",
"react-qr-reader": "^2.2.1",
"react-redux": "7.1.0",
"react-redux": "7.1.1",
"react-router-dom": "^5.0.1",
"recompose": "^0.30.0",
"redux": "4.0.4",
Expand Down Expand Up @@ -93,11 +93,11 @@
"@storybook/addon-knobs": "5.1.11",
"@storybook/addon-links": "5.1.11",
"@storybook/react": "5.1.11",
"@testing-library/react": "9.1.1",
"@testing-library/react": "9.1.3",
"autoprefixer": "9.6.1",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "10.0.2",
"babel-jest": "24.8.0",
"babel-eslint": "10.0.3",
"babel-jest": "24.9.0",
"babel-loader": "8.0.6",
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-plugin-transform-es3-member-expression-literals": "^6.22.0",
Expand All @@ -109,17 +109,17 @@
"eslint-config-airbnb": "18.0.1",
"eslint-plugin-flowtype": "4.2.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jest": "22.15.1",
"eslint-plugin-jest": "22.16.0",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.14.3",
"ethereumjs-abi": "0.6.8",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"file-loader": "4.2.0",
"flow-bin": "0.105.2",
"flow-bin": "0.106.3",
"fs-extra": "8.1.0",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.0.4",
"jest": "24.8.0",
"jest": "24.9.0",
"jest-dom": "4.0.0",
"json-loader": "^0.5.7",
"mini-css-extract-plugin": "0.8.0",
Expand All @@ -132,13 +132,14 @@
"storybook-host": "5.1.0",
"storybook-router": "^0.3.3",
"style-loader": "1.0.0",
"truffle": "5.0.31",
"truffle-contract": "4.0.28",
"truffle-solidity-loader": "0.1.30",
"truffle": "5.0.34",
"truffle-contract": "4.0.31",
"truffle-solidity-loader": "0.1.32",
"uglifyjs-webpack-plugin": "2.2.0",
"webpack": "4.39.2",
"url-loader": "^2.1.0",
"webpack": "4.39.3",
"webpack-bundle-analyzer": "3.4.1",
"webpack-cli": "3.3.6",
"webpack-cli": "3.3.7",
"webpack-dev-server": "3.8.0",
"webpack-manifest-plugin": "^2.0.0-rc.2"
}
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
14 changes: 1 addition & 13 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,10 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="favicon.ico">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,500" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,500,700" rel="stylesheet">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<title>Multisig Safe</title>
<title>Gnosis Safe For Teams</title>
</head>
<body>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start`.
To create a production bundle, use `npm run build`.
-->
</body>
</html>
Binary file added src/assets/fonts/Averta-ExtraBold.woff2
Binary file not shown.
Binary file added src/assets/fonts/Averta-normal.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion src/assets/icons/qrcode.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/trash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Header/assets/gnosis-safe-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 88e37d5

Please sign in to comment.