Bladeren bron

fix: update theme style, adjust border color of checkbox and radio button, simplify checkbox implementation on login page

nian 1 maand geleden
bovenliggende
commit
2515935fd0
4 gewijzigde bestanden met toevoegingen van 20 en 9 verwijderingen
  1. 1 1
      src/layout/header/actions/component/LayoutThumbnail.vue
  2. 10 0
      src/theme/dark.ts
  3. 8 0
      src/theme/light.ts
  4. 1 8
      src/views/sign-in/index.vue

+ 1 - 1
src/layout/header/actions/component/LayoutThumbnail.vue

@@ -76,7 +76,7 @@ const preferencesStore = usePreferencesStore()
               :key="i"
               class="size-1 rounded-full border border-neutral-350 dark:border-neutral-650"
             />
-            <div class="size-1 rounded-full border border-primary" />
+            <div class="size-1 rounded-full bg-primary" />
           </div>
         </div>
       </div>

+ 10 - 0
src/theme/dark.ts

@@ -115,6 +115,11 @@ export function baseDarkThemeOverrides(primaryColor = ''): GlobalThemeOverrides
     Card: {
       borderColor: DARK.borderColor,
     },
+    Checkbox: {
+      common: {
+        borderColor: twc.neutral[700],
+      },
+    },
     DataTable: {
       borderColor: DARK.borderColor,
       tdColor: twc.neutral[900],
@@ -168,6 +173,11 @@ export function baseDarkThemeOverrides(primaryColor = ''): GlobalThemeOverrides
         },
       },
     },
+    Radio: {
+      common: {
+        borderColor: twc.neutral[700],
+      },
+    },
     Select: {
       peers: {
         InternalSelectMenu: {

+ 8 - 0
src/theme/light.ts

@@ -113,6 +113,9 @@ export function baseLightThemeOverrides(primaryColor = ''): GlobalThemeOverrides
       borderColor: LIGHT.borderColor,
     },
     Checkbox: {
+      common: {
+        borderColor: twc.neutral[250],
+      },
       colorDisabled: twc.neutral[100],
     },
     DataTable: {
@@ -169,6 +172,11 @@ export function baseLightThemeOverrides(primaryColor = ''): GlobalThemeOverrides
       color: twc.neutral[25],
       textColor: LIGHT.textColor2,
     },
+    Radio: {
+      common: {
+        borderColor: twc.neutral[250],
+      },
+    },
     Slider: {
       indicatorColor: twc.neutral[25],
       indicatorTextColor: LIGHT.textColor2,

+ 1 - 8
src/views/sign-in/index.vue

@@ -16,7 +16,6 @@ import { mediaQueryInjectionKey } from '@/injection'
 import ThemePopselect from '@/layout/header/actions/component/ThemePopselect.vue'
 import router from '@/router'
 import { useUserStore } from '@/stores'
-import twc from '@/utils/tailwindColor'
 
 import ThemeColorPopover from './component/ThemeColorPopover.vue'
 
@@ -217,13 +216,7 @@ onUnmounted(() => {
                 </NInput>
               </NFormItem>
               <div class="flex justify-between">
-                <NCheckbox
-                  :theme-overrides="{
-                    border: `1px solid ${twc.neutral[isDark ? 650 : 300]}`,
-                  }"
-                  v-model:checked="isRememberMed"
-                  >记住我</NCheckbox
-                >
+                <NCheckbox v-model:checked="isRememberMed">记住我</NCheckbox>
                 <NButton
                   text
                   size="small"