Merge branch 'implement-ui' into add-event-saga-fix-user-state

4 years ago · a0a73af0eb
4 changed files with 9 additions and 6 deletions
--- a/packages/concordia-app/src/assets/css/index.css
+++ b/packages/concordia-app/src/assets/css/index.css
@ -1,4 +1,5 @@
 body {
+    overflow: auto;
    margin: 1em !important;
 }

@ -8,4 +9,4 @@ body {

 .i18next-newlines {
    white-space: pre-line !important;
-}
+}
--- a/packages/concordia-app/src/assets/css/loading-component.css
+++ b/packages/concordia-app/src/assets/css/loading-component.css
@ -2,16 +2,17 @@ body {
    overflow: hidden;
 }

-ul {
-    list-style-position: inside;
-}
-
 .loading-screen {
+    overflow: hidden;
    margin-top: 10em;
    text-align: center;
    font-size: large;
 }

+.loading-screen ul {
+    list-style-position: inside;
+}
+
 .loading-img {
    margin-bottom: 3em;
    height: 12em;
--- a/packages/concordia-app/src/components/LoadingContainer.jsx
+++ b/packages/concordia-app/src/components/LoadingContainer.jsx
@ -37,7 +37,7 @@ const LoadingContainer = ({ children }) => {
        <LoadingComponent
          title="No connection to the Ethereum network!"
          message="Please make sure that:"
-          message_list={['MetaMask is unlocked and pointed to the correct, available network',
+          messageList={['MetaMask is unlocked and pointed to the correct, available network',
            'The app has been granted the right to connect to your account']}
          imageType="ethereum"
          progress={20}
--- a/packages/concordia-app/src/constants/ContractNames.js
+++ b/packages/concordia-app/src/constants/ContractNames.js
@ -0,0 +1 @@
+export const FORUM = 'Forum';