From ccac509cabde04be926c812a6a67af1d44adf68a Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 27 Jan 2021 20:58:13 +0200 Subject: [PATCH] Small tweaks --- .../concordia-app/src/assets/css/index.css | 6 ++ .../src/components/PostCreate/styles.css | 7 +- .../MainLayout/MainLayoutMenu/styles.css | 2 +- .../src/views/Home/Board/index.jsx | 93 ++++++++----------- .../src/views/Home/Board/styles.css | 5 + .../src/views/Topic/TopicView/index.jsx | 4 +- .../src/views/Topic/TopicView/styles.css | 3 +- 7 files changed, 62 insertions(+), 58 deletions(-) diff --git a/packages/concordia-app/src/assets/css/index.css b/packages/concordia-app/src/assets/css/index.css index aed14e1..594a9ce 100644 --- a/packages/concordia-app/src/assets/css/index.css +++ b/packages/concordia-app/src/assets/css/index.css @@ -1,3 +1,9 @@ +:root { + --primary-color: #0B2540; + --secondary-color: #EA6954; + --secondary-color-highlighted: #DB5844; +} + body.app { overflow: auto; margin: 0; diff --git a/packages/concordia-app/src/components/PostCreate/styles.css b/packages/concordia-app/src/components/PostCreate/styles.css index 9dd9dfb..94d5fc5 100644 --- a/packages/concordia-app/src/components/PostCreate/styles.css +++ b/packages/concordia-app/src/components/PostCreate/styles.css @@ -10,9 +10,14 @@ #post-button { float: right; - margin-top: 1rem; + margin: 1rem 0; } #post-button button { margin: 0; + background-color: var(--secondary-color); +} + +#post-button button:hover { + background-color: var(--secondary-color-highlighted); } diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css index 5bfe235..46bc68f 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css @@ -3,7 +3,7 @@ } .ui.inverted.menu { - background: #0B2540 !important; + background: var(--primary-color) !important; border-radius: 0; margin-bottom: 2em; } diff --git a/packages/concordia-app/src/views/Home/Board/index.jsx b/packages/concordia-app/src/views/Home/Board/index.jsx index f7daaa8..43e7c23 100644 --- a/packages/concordia-app/src/views/Home/Board/index.jsx +++ b/packages/concordia-app/src/views/Home/Board/index.jsx @@ -16,60 +16,47 @@ const Board = (props) => { const history = useHistory(); const { t } = useTranslation(); - const boardContents = useMemo(() => { - if (numberOfTopics > 0) { - return ( - <> - {hasSignedUp - ? ( -