From 136f4049eb473af0bbb1c0e1173443f86a54c269 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Tue, 29 Oct 2024 12:47:59 +0300
Subject: [PATCH 1/8] fix: ui bugs in light theme 1

---
 src/components/LoginForm.vue                  | 28 +++++++++++++++++--
 .../nodes/components/NodesTableHead.vue       | 17 +++++++++++
 src/views/Login.vue                           |  3 +-
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index 2d3b9bbf1..cc1e42642 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -1,13 +1,13 @@
 <template>
-  <v-form ref="form" class="login-form" @submit.prevent="submit">
+  <v-form ref="form" :class="className" @submit.prevent="submit">
     <v-row no-gutters>
       <slot>
         <v-text-field
           v-model="passphrase"
           :label="$t('login.password_label')"
           autocomplete="current-password"
+          :class="`${className}__textfield`"
           class="text-center"
-          color="white"
           :type="showPassphrase ? 'text' : 'password'"
           variant="underlined"
         >
@@ -72,6 +72,7 @@ export default defineComponent({
     const router = useRouter()
     const store = useStore()
     const { t } = useI18n()
+    const className = 'login-form'
     const showSpinner = ref(false)
 
     const showPassphrase = ref(false)
@@ -133,6 +134,7 @@ export default defineComponent({
       showSpinner,
       passphrase,
       showPassphrase,
+      className,
       togglePassphraseVisibility,
       submit,
       freeze,
@@ -142,3 +144,25 @@ export default defineComponent({
   }
 })
 </script>
+
+<style lang="scss" scoped>
+@import 'vuetify/settings';
+@import '@/assets/styles/settings/_colors.scss';
+
+/** Themes **/
+.v-theme--light {
+  .login-form {
+    &__textfield {
+      color: map-get($adm-colors, 'regular');
+    }
+  }
+}
+.v-theme--dark {
+  .login-form {
+    &__textfield {
+      color: map-get($shades, 'white');
+    }
+  }
+}
+
+</style>
diff --git a/src/components/nodes/components/NodesTableHead.vue b/src/components/nodes/components/NodesTableHead.vue
index 863d521c5..853e96add 100644
--- a/src/components/nodes/components/NodesTableHead.vue
+++ b/src/components/nodes/components/NodesTableHead.vue
@@ -60,6 +60,7 @@ export default {
 
 <style lang="scss">
 @import 'vuetify/settings';
+@import '@/assets/styles/settings/_colors.scss';
 
 .nodes-table-head {
   &__th {
@@ -76,4 +77,20 @@ export default {
     width: 104px;
   }
 }
+
+/** Themes **/
+.v-theme--light {
+  .nodes-table-head {
+    &__th {
+      color: map-get($adm-colors, 'regular');
+    }
+  }
+}
+.v-theme--dark {
+  .nodes-table-head {
+    &__th {
+      color: map-get($adm-colors, 'white');
+    }
+  }
+}
 </style>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 08768aaca..d9ea620e5 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -229,7 +229,8 @@ export default defineComponent({
   .login-page {
     &__icon,
     &__title,
-    &__subtitle {
+    &__subtitle,
+    &__settings-button {
       color: map-get($adm-colors, 'regular');
     }
   }

From cd5c34fc8024a05b11bc09d08270065126694165 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Mon, 4 Nov 2024 12:07:50 +0300
Subject: [PATCH 2/8] fix: ui bugs in light theme 2

---
 .../DelegatesTable/DelegateVoteCheckbox.vue         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/DelegatesTable/DelegateVoteCheckbox.vue b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
index 1d176dac9..94c148611 100644
--- a/src/components/DelegatesTable/DelegateVoteCheckbox.vue
+++ b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
@@ -93,13 +93,14 @@ export default {
   .delegate-vote-checkbox {
     &__icon {
       color: map-get($adm-colors, 'muted');
-    }
-  }
-}
 
-.dark {
-  .delegate-vote-checkbox {
-    &__icon {
+      &--good {
+        color: map-get($adm-colors, 'good');
+      }
+
+      &--danger {
+        color: map-get($adm-colors, 'danger');
+      }
     }
   }
 }

From b7c8f85cd00b15001e74ab7c128f76a72cc2ae91 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sun, 10 Nov 2024 21:01:25 +0300
Subject: [PATCH 3/8] Small style fixes due to comments

---
 .../DelegatesTable/DelegateVoteCheckbox.vue   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/DelegatesTable/DelegateVoteCheckbox.vue b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
index 94c148611..4ec4060f1 100644
--- a/src/components/DelegatesTable/DelegateVoteCheckbox.vue
+++ b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
@@ -78,26 +78,31 @@ export default {
   &__icon {
     font-size: 24px !important;
     height: 24px !important;
+  }
+}
 
-    &--good {
-      color: map-get($adm-colors, 'good');
-    }
+/** Themes **/
+.v-theme--light {
+  .delegate-vote-checkbox {
+    &__icon {
+      &--good {
+        color: map-get($adm-colors, 'good');
+      }
 
-    &--danger {
-      color: map-get($adm-colors, 'danger');
+      &--danger {
+        color: map-get($adm-colors, 'danger');
+      }
     }
   }
 }
 
-.v-theme--light {
+.v-theme--dark {
   .delegate-vote-checkbox {
     &__icon {
-      color: map-get($adm-colors, 'muted');
-
       &--good {
         color: map-get($adm-colors, 'good');
       }
-
+      
       &--danger {
         color: map-get($adm-colors, 'danger');
       }

From 4dd0a94ce58e78200a7e9f5c4fad44bb2ea661f0 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sun, 10 Nov 2024 21:13:41 +0300
Subject: [PATCH 4/8] LoginForm.vue classes refactoring according to comments.

---
 src/components/LoginForm.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index cc1e42642..1f8487fae 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -1,12 +1,12 @@
 <template>
-  <v-form ref="form" :class="className" @submit.prevent="submit">
+  <v-form ref="form" :class="classes.root" @submit.prevent="submit">
     <v-row no-gutters>
       <slot>
         <v-text-field
           v-model="passphrase"
           :label="$t('login.password_label')"
           autocomplete="current-password"
-          :class="`${className}__textfield`"
+          :class="classes.textField"
           class="text-center"
           :type="showPassphrase ? 'text' : 'password'"
           variant="underlined"
@@ -72,8 +72,12 @@ export default defineComponent({
     const router = useRouter()
     const store = useStore()
     const { t } = useI18n()
-    const className = 'login-form'
     const showSpinner = ref(false)
+    const className = 'login-form'
+    const classes = {
+      root: className,
+      textField: `${className}__textfield`
+    }
 
     const showPassphrase = ref(false)
     const togglePassphraseVisibility = () => {
@@ -134,7 +138,7 @@ export default defineComponent({
       showSpinner,
       passphrase,
       showPassphrase,
-      className,
+      classes,
       togglePassphraseVisibility,
       submit,
       freeze,

From 8b6e5672452520bfb7293dd4d4cf346da6bf8ff4 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sun, 10 Nov 2024 21:58:52 +0300
Subject: [PATCH 5/8] LoginForm: classes moved outside the component
 definition.

---
 src/components/LoginForm.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index 1f8487fae..0caeeaad2 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -60,6 +60,12 @@ import { useRouter } from 'vue-router'
 import { isAxiosError } from 'axios'
 import { isAllNodesOfflineError, isAllNodesDisabledError } from '@/lib/nodes/utils/errors'
 
+const className = 'login-form'
+const classes = {
+  root: className,
+  textField: `${className}__textfield`
+}
+
 export default defineComponent({
   props: {
     modelValue: {
@@ -73,12 +79,6 @@ export default defineComponent({
     const store = useStore()
     const { t } = useI18n()
     const showSpinner = ref(false)
-    const className = 'login-form'
-    const classes = {
-      root: className,
-      textField: `${className}__textfield`
-    }
-
     const showPassphrase = ref(false)
     const togglePassphraseVisibility = () => {
       showPassphrase.value = !showPassphrase.value

From 21acf6b902e4b58ea8969057882b080ad2128b25 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Thu, 14 Nov 2024 10:38:04 +0300
Subject: [PATCH 6/8] Light/dark themes delegate vote checkbox styles
 separation

---
 src/components/DelegatesTable/DelegateVoteCheckbox.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/DelegatesTable/DelegateVoteCheckbox.vue b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
index 4ec4060f1..96177e058 100644
--- a/src/components/DelegatesTable/DelegateVoteCheckbox.vue
+++ b/src/components/DelegatesTable/DelegateVoteCheckbox.vue
@@ -85,6 +85,7 @@ export default {
 .v-theme--light {
   .delegate-vote-checkbox {
     &__icon {
+      color: map-get($adm-colors, 'muted');
       &--good {
         color: map-get($adm-colors, 'good');
       }

From e10a33ea9fd88e5666f8ee578724147b504cb749 Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Sat, 16 Nov 2024 12:32:08 +0300
Subject: [PATCH 7/8] fix: node status word 'Syncing' instead of 'Sync'

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index f959ca233..f2d869d74 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -180,7 +180,7 @@
     "label": "Type",
     "host": "Host",
     "inactive": "Inactive",
-    "sync": "Sync",
+    "sync": "Syncing",
     "ms": "ms",
     "nodeLabelDescription": "Support decentralization and enhance privacy level—<a target=\"_blank\" href=\"https://medium.com/adamant-im/how-to-run-your-adamant-node-on-ubuntu-990e391e8fcc\">run your own ADAMANT node</a>. To add your nodes to the list, you need <a target=\"_blank\" href=\"https://github.com/Adamant-im/adamant-im/\">to deploy web application on separate domain</a>. This limitation refers to Content Security Policy (CSP).",
     "offline": "Offline",

From b469aa10f0699de29d01cbd71c26fb9b4132415d Mon Sep 17 00:00:00 2001
From: Ivanov N <nik@tmails.net>
Date: Mon, 18 Nov 2024 09:24:15 +0300
Subject: [PATCH 8/8] NodesTableHead: fix label font color

---
 src/components/nodes/components/NodesTableHead.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/nodes/components/NodesTableHead.vue b/src/components/nodes/components/NodesTableHead.vue
index 853e96add..55c592e5d 100644
--- a/src/components/nodes/components/NodesTableHead.vue
+++ b/src/components/nodes/components/NodesTableHead.vue
@@ -81,14 +81,14 @@ export default {
 /** Themes **/
 .v-theme--light {
   .nodes-table-head {
-    &__th {
+    &__th, &__label {
       color: map-get($adm-colors, 'regular');
     }
   }
 }
 .v-theme--dark {
   .nodes-table-head {
-    &__th {
+    &__th, &__label {
       color: map-get($adm-colors, 'white');
     }
   }