diff --git a/packages/concordia-app/public/locales/en/translation.json b/packages/concordia-app/public/locales/en/translation.json
index e09a733..d37376c 100644
--- a/packages/concordia-app/public/locales/en/translation.json
+++ b/packages/concordia-app/public/locales/en/translation.json
@@ -69,7 +69,7 @@
"topbar.button.register": "Sign Up",
"topic.create.form.content.field.label": "First post content",
"topic.create.form.content.field.placeholder": "Message",
- "topic.create.form.post.button": "Post",
+ "topic.create.form.post.button": "Create Topic",
"topic.create.form.subject.field.label": "Topic subject",
"topic.create.form.subject.field.placeholder": "Subject",
"topic.list.row.topic.id": "#{{id}}",
diff --git a/packages/concordia-app/src/assets/css/index.css b/packages/concordia-app/src/assets/css/index.css
index e7005f0..2ecb4f9 100644
--- a/packages/concordia-app/src/assets/css/index.css
+++ b/packages/concordia-app/src/assets/css/index.css
@@ -1,11 +1,13 @@
:root {
- --primary-color: #0B2540;
- --primary-color-highlighted: #061A30;
- --secondary-color: #EA6954;
- --secondary-color-highlighted: #DB5844;
+ --primary-color: #EA6954;
+ --primary-color-highlighted: #DB5844;
+ --secondary-color: #0B2540;
+ --secondary-color-highlighted: #061A30;
}
body.app {
+ height: auto;
+ padding-bottom: 4rem;
overflow: auto;
margin: 0;
background: #E6E6E6;
@@ -28,11 +30,31 @@ div {
font-style: italic;
}
-.main-button{
+.primary-button{
+ color: white !important;
+ background-color: var(--primary-color) !important;
+}
+
+.primary-button:hover {
+ background-color: var(--primary-color-highlighted) !important;
+}
+
+.secondary-button{
color: white !important;
background-color: var(--secondary-color) !important;
}
-.main-button:hover {
+.secondary-button:hover {
background-color: var(--secondary-color-highlighted) !important;
}
+
+.skip-button {
+ color: var(--secondary-color) !important;
+ background-color: white !important;
+ box-shadow: 0 0 0 1px var(--secondary-color) inset !important;
+}
+
+.skip-button:hover {
+ color: var(--secondary-color-highlighted) !important;
+ box-shadow: 0 0 0 1px var(--secondary-color-highlighted) inset !important;
+}
diff --git a/packages/concordia-app/src/assets/particles.js b/packages/concordia-app/src/assets/particles.js
index d4ce239..68a19b7 100644
--- a/packages/concordia-app/src/assets/particles.js
+++ b/packages/concordia-app/src/assets/particles.js
@@ -16,7 +16,7 @@ const particlesOptions = {
speed: 0.12,
},
size: {
- value: 1,
+ value: 1.5,
},
opacity: {
anim: {
diff --git a/packages/concordia-app/src/components/ClearDatabasesModal/index.jsx b/packages/concordia-app/src/components/ClearDatabasesModal/index.jsx
index 26e47fe..db2aa72 100644
--- a/packages/concordia-app/src/components/ClearDatabasesModal/index.jsx
+++ b/packages/concordia-app/src/components/ClearDatabasesModal/index.jsx
@@ -126,10 +126,10 @@ const ClearDatabasesModal = (props) => {
{!isClearing && (
-
diff --git a/packages/concordia-app/src/components/PostCreate/index.jsx b/packages/concordia-app/src/components/PostCreate/index.jsx
index 17ea739..bf75927 100644
--- a/packages/concordia-app/src/components/PostCreate/index.jsx
+++ b/packages/concordia-app/src/components/PostCreate/index.jsx
@@ -136,7 +136,7 @@ const PostCreate = (props) => {
diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css
index 86cb6a1..6a3de17 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: var(--primary-color) !important;
+ background: var(--secondary-color) !important;
border-radius: 0;
margin-bottom: 4rem;
}
diff --git a/packages/concordia-app/src/views/Home/Board/index.jsx b/packages/concordia-app/src/views/Home/Board/index.jsx
index 7b93ea6..8aa9498 100644
--- a/packages/concordia-app/src/views/Home/Board/index.jsx
+++ b/packages/concordia-app/src/views/Home/Board/index.jsx
@@ -22,7 +22,7 @@ const Board = (props) => {
? (
{
-
+
{t('edit.information.modal.form.cancel.button')}
{
div {
- margin-bottom: 4rem;
+#profile-container {
+ height: auto !important;
}
diff --git a/packages/concordia-app/src/views/Register/PersonalInformationStep/index.jsx b/packages/concordia-app/src/views/Register/PersonalInformationStep/index.jsx
index 1ac1cdb..90595c9 100644
--- a/packages/concordia-app/src/views/Register/PersonalInformationStep/index.jsx
+++ b/packages/concordia-app/src/views/Register/PersonalInformationStep/index.jsx
@@ -150,16 +150,15 @@ const PersonalInformationStep = (props) => {
)}
diff --git a/packages/concordia-app/src/views/Register/SignUpStep/index.jsx b/packages/concordia-app/src/views/Register/SignUpStep/index.jsx
index 7e8cb8b..d180ca9 100644
--- a/packages/concordia-app/src/views/Register/SignUpStep/index.jsx
+++ b/packages/concordia-app/src/views/Register/SignUpStep/index.jsx
@@ -94,7 +94,7 @@ const SignUpStep = (props) => {
)}
{
loading={!usernameIsChecked}
/>
{
const [currentStep, setCurrentStep] = useState('signup');
@@ -107,7 +107,7 @@ const Register = () => {
{
return (
-
+
-
-
-
- {t('topic.create.form.post.button')}
-
-
-
-
-
-
+
+
+ {t('topic.create.form.post.button')}
+
+
+
+
+
+
);
diff --git a/packages/concordia-app/src/views/Topic/TopicCreate/styles.css b/packages/concordia-app/src/views/Topic/TopicCreate/styles.css
index 229f696..5d078ac 100644
--- a/packages/concordia-app/src/views/Topic/TopicCreate/styles.css
+++ b/packages/concordia-app/src/views/Topic/TopicCreate/styles.css
@@ -9,3 +9,8 @@
border-color: rgb(224, 180, 180) !important;
background-color: rgb(255, 246, 246) !important;
}
+
+#create-topic-button {
+ float: right;
+ margin: 1rem 0 4rem 0;
+}
diff --git a/packages/concordia-app/src/views/Topic/TopicView/styles.css b/packages/concordia-app/src/views/Topic/TopicView/styles.css
index b592494..75b87b7 100644
--- a/packages/concordia-app/src/views/Topic/TopicView/styles.css
+++ b/packages/concordia-app/src/views/Topic/TopicView/styles.css
@@ -1,5 +1,5 @@
#topic-container {
- height: 100%;
+ height: auto !important;
}
#topic-header {