From 8aa74ab7fd8fc0087a9c88518eba3369a2211b34 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 20 Jan 2021 16:03:47 +0200 Subject: [PATCH] Minor ui improvements --- .../patches/web3-core-requestmanager+1.3.1.patch | 5 +++-- packages/concordia-app/src/assets/css/index.css | 9 ++++----- .../src/layouts/MainLayout/MainLayoutMenu/index.jsx | 4 +++- .../src/layouts/MainLayout/MainLayoutMenu/styles.css | 9 +++++++++ yarn.lock | 2 +- 5 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css diff --git a/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch b/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch index 4891f47..2613b98 100644 --- a/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch +++ b/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/web3-core-requestmanager/lib/index.js b/node_modules/web3-core-requestmanager/lib/index.js -index 32caf52..b51b734 100644 +index 32caf52..835b4d8 100644 --- a/node_modules/web3-core-requestmanager/lib/index.js +++ b/node_modules/web3-core-requestmanager/lib/index.js -@@ -82,13 +82,25 @@ RequestManager.prototype.setProvider = function (provider, net) { +@@ -82,13 +82,26 @@ RequestManager.prototype.setProvider = function (provider, net) { this.provider = provider || null; // listen to incoming notifications if (this.provider && this.provider.on) { @@ -13,6 +13,7 @@ index 32caf52..b51b734 100644 - _this.subscriptions.get(result.params.subscription).callback(null, result.params.result); - } - }); ++ // See also https://github.com/ChainSafe/web3.js/pull/3864 + if (typeof provider.request === 'function') { // EIP-1193 provider + this.provider.on('message', function (payload) { + if (payload && payload.type === 'eth_subscription' && payload.data) { diff --git a/packages/concordia-app/src/assets/css/index.css b/packages/concordia-app/src/assets/css/index.css index 2848ffd..31db996 100644 --- a/packages/concordia-app/src/assets/css/index.css +++ b/packages/concordia-app/src/assets/css/index.css @@ -3,6 +3,10 @@ body.app { margin: 0; } +div { + word-break: break-word; +} + #root { height: 100%; } @@ -15,8 +19,3 @@ body.app { color: gray; font-style: italic; } - -.ui.inverted.menu { - background: #0B2540; - border-radius: 0; -} diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx index 0a52901..b2453f0 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx @@ -4,8 +4,9 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router'; import { useSelector } from 'react-redux'; import AppContext from '../../../components/AppContext'; -import appLogo from '../../../assets/images/app_logo.svg'; import ClearDatabasesModal from '../../../components/ClearDatabasesModal'; +import appLogo from '../../../assets/images/app_logo.svg'; +import './styles.css'; const MainLayoutMenu = () => { const hasSignedUp = useSelector((state) => state.user.hasSignedUp); @@ -32,6 +33,7 @@ const MainLayoutMenu = () => { {() => (