diff --git a/front/src/assets/css/main.css b/front/src/assets/css/main.css
new file mode 100644
index 0000000..3a8c9e5
--- /dev/null
+++ b/front/src/assets/css/main.css
@@ -0,0 +1,12 @@
+:root {
+ --primary-text: #ffffff;
+ --secondary-text: #a9b2bc;
+ /* 9fa9ba */
+ --primary-background: #1d1d23;
+ --secondary-background: #24242b;
+ /* 1d1d23 */
+ --tertiary-background: #2a2a33;
+ --quaternary-background: #303a46;
+ --selected: #41474f;
+}
+/* .badge-primary { */
\ No newline at end of file
diff --git a/front/src/components/Badge.vue b/front/src/components/Badge.vue
index 72bf93e..ee118c3 100644
--- a/front/src/components/Badge.vue
+++ b/front/src/components/Badge.vue
@@ -37,7 +37,7 @@ export default {
}
.badge-primary {
- color: #fff;
+ color: var(--primary-text);
background-color: #007bff;
}
diff --git a/front/src/main.ts b/front/src/main.ts
index 2b71777..7684bf5 100644
--- a/front/src/main.ts
+++ b/front/src/main.ts
@@ -2,6 +2,7 @@ import { createApp } from "vue";
import router from "./router";
import App from "./App.vue";
import store from "./store/store";
+import "@/assets/css/main.css";
const app = createApp(App);
app.use(router);
diff --git a/front/src/views/modals/AddAccountModal.vue b/front/src/views/modals/AddAccountModal.vue
index 6b07af3..d1cbc17 100644
--- a/front/src/views/modals/AddAccountModal.vue
+++ b/front/src/views/modals/AddAccountModal.vue
@@ -174,6 +174,8 @@ fieldset {
margin-top: 5px;
border-radius: 5px;
display: grid;
+ border-color: var(--primary-text);
+ color: var(--primary-text);
}
.config {
@@ -193,7 +195,7 @@ button {
padding: 5px;
padding: 7px 18px;
background-color: #09a35b;
- color: white;
+ color: var(--primary-text);
border-radius: 5px;
border: none;
text-decoration: none;
@@ -207,10 +209,10 @@ button:hover {
input {
-webkit-box-flex: 1;
- background-color: #303a46;
+ background-color: var(--quaternary-background);
border: none;
border-radius: 4px;
- color: #fff;
+ color: var(--primary-text);
-ms-flex: 1;
flex: 1;
font-family: inherit;
@@ -220,6 +222,10 @@ input {
padding: 8px 9px;
}
+label {
+ color: var(--secondary-text);
+}
+
input:focus {
outline: none;
}
diff --git a/front/src/views/modals/Modal.vue b/front/src/views/modals/Modal.vue
index 0974ff0..699144d 100644
--- a/front/src/views/modals/Modal.vue
+++ b/front/src/views/modals/Modal.vue
@@ -45,8 +45,8 @@ function close() {
display: flex;
flex-direction: column;
border-radius: 5px;
- color: white;
- background-color: #1d1d23;
+ color: var(--primary-text);
+ background-color: var(--secondary-background);
padding: 20px;
}
@@ -61,7 +61,7 @@ h2 {
}
.close-button {
- background-color: #9fa9ba;
+ background-color: var(--secondary-text);
cursor: pointer;
height: 18px;
mask: url(../../assets/close.svg);
diff --git a/front/src/views/room/Header.vue b/front/src/views/room/Header.vue
index e589507..6a9e58c 100644
--- a/front/src/views/room/Header.vue
+++ b/front/src/views/room/Header.vue
@@ -6,7 +6,7 @@ import { RoomType } from "@/store/models/model";
const props = defineProps({ id: Number });
const room = ref(store.getters.room(props.id));
-
+// todo auto load
watch(
() => props.id,
(newId) => {
diff --git a/front/src/views/room/Message.vue b/front/src/views/room/Message.vue
index 9779ee9..81a3c27 100644
--- a/front/src/views/room/Message.vue
+++ b/front/src/views/room/Message.vue
@@ -90,15 +90,17 @@ const displayAddresses = (addressesId) => {
diff --git a/front/src/views/sidebar/accounts/Accounts.vue b/front/src/views/sidebar/accounts/Accounts.vue
index d36a119..e8fc6cf 100644
--- a/front/src/views/sidebar/accounts/Accounts.vue
+++ b/front/src/views/sidebar/accounts/Accounts.vue
@@ -38,8 +38,8 @@ export default {
flex-direction: column;
align-items: center;
padding: 5px;
- background-color: #2a2a33;
- color: white;
+ background-color: var(--tertiary-background);
+ color: var(--primary-text);
}
#userMenu {
@@ -48,7 +48,7 @@ export default {
background-color: yellow !important;
}
.divider {
- border-top: 1px solid #bbb;
+ border-top: 1px solid var(--secondary-text);
margin: 5px 0;
width: 90%;
}
diff --git a/front/src/views/sidebar/rooms/Room.vue b/front/src/views/sidebar/rooms/Room.vue
index 8d20094..9035f03 100644
--- a/front/src/views/sidebar/rooms/Room.vue
+++ b/front/src/views/sidebar/rooms/Room.vue
@@ -30,9 +30,9 @@ const router = useRouter();
v-bind:class="store.state.activeRoom == props.data.id ? 'selected' : ''"
>