fix: login view

mp3000mp · Sep 16, 2024 · 786d96e · 786d96e
1 parent 6d88ba0
commit 786d96e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 9 deletions.
diff --git a/frontend/src/assets/main.scss → ...tend/src/assets/style/bootstrap/main.scss b/frontend/src/assets/main.scss → ...tend/src/assets/style/bootstrap/main.scss
@@ -1,14 +1,12 @@
-@import 'variables';
-//@import '~filepond/dist/filepond.min.css';
 
 @import '~bootstrap/scss/functions';
 
-@import 'bootstrap-vars-override';
+@import 'vars-override';
 
 @import '~bootstrap/scss/variables';
 @import '~bootstrap/scss/variables-dark';
 
-@import 'bootstrap-maps-override';
+@import 'maps-override';
 
 @import '~bootstrap/scss/maps';
 @import '~bootstrap/scss/mixins';
@@ -33,5 +31,3 @@
 @import '~bootstrap/scss/spinners';
 
 @import '~bootstrap/scss/utilities/api';
-
-@import 'layout';
diff --git a/...d/src/assets/bootstrap-maps-override.scss → ...assets/style/bootstrap/maps-override.scss b/...d/src/assets/bootstrap-maps-override.scss → ...assets/style/bootstrap/maps-override.scss
diff --git a/...d/src/assets/bootstrap-vars-override.scss → ...assets/style/bootstrap/vars-override.scss b/...d/src/assets/bootstrap-vars-override.scss → ...assets/style/bootstrap/vars-override.scss
@@ -4,3 +4,10 @@ $link-color-dark: $primary;
 
 $input-btn-padding-y: 0.2rem;
 $input-btn-padding-x: 0.4rem;
+
+$btn-padding-y: 1px;
+
+$input-padding-y: 1px;
+
+$alert-padding-x: 6px;
+$alert-padding-y: 4px;
diff --git a/frontend/src/assets/layout.scss → frontend/src/assets/style/layout.scss b/frontend/src/assets/layout.scss → frontend/src/assets/style/layout.scss
diff --git a/frontend/src/assets/style/main.scss b/frontend/src/assets/style/main.scss
@@ -0,0 +1,6 @@
+@import 'variables';
+//@import '~filepond/dist/filepond.min.css';
+
+@import 'bootstrap/main';
+
+@import 'layout';
diff --git a/frontend/src/assets/variables.scss → frontend/src/assets/style/variables.scss b/frontend/src/assets/variables.scss → frontend/src/assets/style/variables.scss
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
@@ -1,4 +1,4 @@
-import './assets/main.scss'
+import './assets/style/main.scss'
 
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'

diff --git a/frontend/src/views/security/LoginView.vue b/frontend/src/views/security/LoginView.vue
@@ -73,7 +73,7 @@ onMounted(async () => {
           v-model="twoFactorAuthCode"
           @keyup.enter="twoFactorAuth"
           class="form-control"
-          type="string"
+          type="text"
           placeholder="Code"
           :disabled="isLoading"
         />
@@ -97,7 +97,7 @@ onMounted(async () => {
         <input
           v-model="password"
           @keyup.enter="connect"
-          class="form-control"
+          class="form-control ms-2"
           type="password"
           placeholder="Password"
           :disabled="isLoading"