Skip to content

Commit 9192b02

Browse files
boxsnakeboxsnake
authored
Merge pull request #15 from kongying-tavern/feat/dark-mode
Dark Mode
2 parents 111d4f3 + 5f2c4b6 commit 9192b02

File tree

12 files changed

+74
-66
lines changed

12 files changed

+74
-66
lines changed

‎auto-imports.d.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ declare global {
4545
const toRaw: typeof import('vue')['toRaw']
4646
const toRef: typeof import('vue')['toRef']
4747
const toRefs: typeof import('vue')['toRefs']
48+
const toValue: typeof import('vue')['toValue']
4849
const triggerRef: typeof import('vue')['triggerRef']
4950
const unref: typeof import('vue')['unref']
5051
const useAttrs: typeof import('vue')['useAttrs']
@@ -59,5 +60,6 @@ declare global {
5960
// for type re-export
6061
declare global {
6162
// @ts-ignore
62-
export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
63+
export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
64+
import('vue')
6365
}

‎src/assets/effects/scrollbar.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
$scrollbar-width: 0.4rem;
66
$scrollbar-radius: math.div($scrollbar-width, 2);
77
$scrollbar-colors-light: (
8-
"scrollbar-track-color": $color-gray-4,
9-
"scrollbar-thumb-color": $color-gray-3,
8+
scrollbar-track-color: $color-gray-3,
9+
scrollbar-thumb-color: $color-gray-2,
1010
);
1111
$scrollbar-colors-dark: (
12-
"scrollbar-track-color": $color-gray-4,
13-
"scrollbar-thumb-color": $color-gray-3,
12+
scrollbar-track-color: $color-black-2,
13+
scrollbar-thumb-color: $color-black-1,
1414
);
1515
$scrollbar-colors: (
1616
light: $scrollbar-colors-light,

‎src/assets/vars/color.scss‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1+
// Color: White Base
12
$color-white-1: #fff;
3+
4+
// Color: Blue Base
25
$color-blue-1: #e6ecf2;
3-
$color-blue-2: #66b3ff;
4-
$color-blue-3: #39f;
5-
$color-gray-1: #737980;
6-
$color-gray-2: #808080;
7-
$color-gray-3: #b3b3b3;
8-
$color-gray-4: #f2f2f2;
9-
$color-gray-5: #666;
10-
$color-gray-6: #ccc;
11-
$color-gray-7: #999;
6+
$color-blue-2: #177ee6;
7+
$color-blue-3: #66b3ff;
8+
9+
// Color: Gray Base
10+
$color-gray-1: #808080;
11+
$color-gray-2: #b3b3b3;
12+
$color-gray-3: #f2f2f2;
13+
14+
// Color: Black Base
15+
$color-black-1: #333;
16+
$color-black-2: #1a1a1a;
17+
$color-black-3: #262626;

‎src/components/ButtonBasic/color.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
$btn-colors-light: (
44
btn-default-fill-color: $color-white-1,
5-
btn-default-text-color: $color-gray-2,
6-
btn-primary-fill-color: $color-blue-2,
5+
btn-default-text-color: $color-gray-1,
6+
btn-primary-fill-color: $color-blue-3,
77
btn-primary-text-color: $color-white-1,
88
);
99
$btn-colors-dark: (
10-
btn-default-fill-color: $color-white-1,
11-
btn-default-text-color: $color-gray-2,
10+
btn-default-fill-color: $color-black-3,
11+
btn-default-text-color: $color-white-1,
1212
btn-primary-fill-color: $color-blue-2,
1313
btn-primary-text-color: $color-white-1,
1414
);

‎src/components/CardBasic/color.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $card-colors-light: (
44
card-bg-color: $color-white-1,
55
);
66
$card-colors-dark: (
7-
card-bg-color: $color-white-1,
7+
card-bg-color: $color-black-3,
88
);
99
$card-colors: (
1010
light: $card-colors-light,

‎src/components/TextAreaBasic/color.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
$textarea-colors-light: (
44
textarea-bg-color: $color-white-1,
5-
textarea-text-color: $color-gray-2,
6-
textarea-placeholder-color: $color-gray-3,
5+
textarea-text-color: $color-gray-1,
6+
textarea-placeholder-color: $color-gray-2,
77
);
88
$textarea-colors-dark: (
9-
textarea-bg-color: $color-white-1,
10-
textarea-text-color: $color-gray-2,
11-
textarea-placeholder-color: $color-gray-3,
9+
textarea-bg-color: $color-black-3,
10+
textarea-text-color: $color-white-1,
11+
textarea-placeholder-color: $color-gray-1,
1212
);
1313
$textarea-colors: (
1414
light: $textarea-colors-light,

‎src/views/pageTypewriter/components/Portrait/ActionBar/color.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
@use "@/assets/vars/color.scss" as *;
22

33
$colors-light: (
4-
keyboard-default-color: $color-gray-5,
5-
keyboard-active-color: $color-blue-2,
6-
arrow-default-color: $color-gray-5,
7-
arrow-active-color: $color-blue-2,
4+
keyboard-default-color: $color-gray-1,
5+
keyboard-active-color: $color-blue-3,
6+
arrow-default-color: $color-gray-1,
7+
arrow-active-color: $color-blue-3,
88
);
99
$colors-dark: (
10-
keyboard-default-color: $color-gray-5,
10+
keyboard-default-color: $color-white-1,
1111
keyboard-active-color: $color-blue-2,
12-
arrow-default-color: $color-gray-5,
12+
arrow-default-color: $color-white-1,
1313
arrow-active-color: $color-blue-2,
1414
);
1515
$colors: (

‎src/views/pageTypewriter/components/Portrait/FontSelector/color.scss‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
@use "@/assets/vars/color.scss" as *;
22

33
$colors-light: (
4-
group-icon-default-color: $color-gray-7,
5-
group-icon-active-color: $color-blue-2,
6-
group-separator-default-color: $color-gray-7,
7-
group-separator-active-color: $color-blue-2,
8-
item-text-default-color: $color-gray-2,
9-
item-text-active-color: $color-blue-2,
4+
group-icon-default-color: $color-gray-1,
5+
group-icon-active-color: $color-blue-3,
6+
group-separator-default-color: $color-gray-1,
7+
group-separator-active-color: $color-blue-3,
8+
item-text-default-color: $color-gray-1,
9+
item-text-active-color: $color-blue-3,
1010
);
1111
$colors-dark: (
12-
group-icon-default-color: $color-gray-7,
12+
group-icon-default-color: $color-gray-1,
1313
group-icon-active-color: $color-blue-2,
14-
group-separator-default-color: $color-gray-7,
14+
group-separator-default-color: $color-gray-1,
1515
group-separator-active-color: $color-blue-2,
16-
item-text-default-color: $color-gray-2,
16+
item-text-default-color: $color-gray-1,
1717
item-text-active-color: $color-blue-2,
1818
);
1919
$colors: (

‎src/views/pageTypewriter/components/Portrait/InputArea/color.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ $colors-light: (
55
focus-outline-color: $color-blue-3,
66
);
77
$colors-dark: (
8-
clear-btn-color: $color-gray-1,
9-
focus-outline-color: $color-blue-3,
8+
clear-btn-color: $color-white-1,
9+
focus-outline-color: $color-blue-2,
1010
);
1111
$colors: (
1212
light: $colors-light,

‎src/views/pageTypewriter/components/Portrait/KeyboardLayout/color.scss‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@
22

33
$colors-light: (
44
keyboard-key-bg-default-color: $color-white-1,
5-
keyboard-key-border-default-color: $color-gray-2,
6-
keyboard-key-text-default-color: $color-gray-5,
7-
keyboard-key-icon-default-color: $color-gray-5,
5+
keyboard-key-border-default-color: $color-gray-1,
6+
keyboard-key-text-default-color: $color-gray-1,
7+
keyboard-key-icon-default-color: $color-gray-1,
88
keyboard-key-bg-hover-color: $color-white-1,
9-
keyboard-key-border-hover-color: $color-gray-2,
10-
keyboard-key-text-hover-color: $color-blue-2,
11-
keyboard-key-icon-hover-color: $color-blue-2,
12-
keyboard-key-bg-active-color: $color-blue-2,
13-
keyboard-key-border-active-color: $color-gray-2,
9+
keyboard-key-border-hover-color: $color-gray-1,
10+
keyboard-key-text-hover-color: $color-gray-1,
11+
keyboard-key-icon-hover-color: $color-gray-1,
12+
keyboard-key-bg-active-color: $color-blue-3,
13+
keyboard-key-border-active-color: $color-blue-3,
1414
keyboard-key-text-active-color: $color-white-1,
1515
keyboard-key-icon-active-color: $color-white-1,
1616
keyboard-key-bg-hold-color: $color-white-1,
17-
keyboard-key-border-hold-color: $color-gray-2,
18-
keyboard-key-text-hold-color: $color-blue-2,
19-
keyboard-key-icon-hold-color: $color-blue-2,
17+
keyboard-key-border-hold-color: $color-gray-1,
18+
keyboard-key-text-hold-color: $color-blue-3,
19+
keyboard-key-icon-hold-color: $color-blue-3,
2020
);
2121
$colors-dark: (
22-
keyboard-key-bg-default-color: $color-white-1,
23-
keyboard-key-border-default-color: $color-gray-2,
24-
keyboard-key-text-default-color: $color-gray-5,
25-
keyboard-key-icon-default-color: $color-gray-5,
26-
keyboard-key-bg-hover-color: $color-blue-2,
27-
keyboard-key-border-hover-color: $color-gray-2,
28-
keyboard-key-text-hover-color: $color-white-1,
29-
keyboard-key-icon-hover-color: $color-white-1,
30-
keyboard-key-bg-active-color: $color-blue-3,
31-
keyboard-key-border-active-color: $color-gray-2,
22+
keyboard-key-bg-default-color: $color-black-3,
23+
keyboard-key-border-default-color: $color-gray-1,
24+
keyboard-key-text-default-color: $color-gray-1,
25+
keyboard-key-icon-default-color: $color-gray-1,
26+
keyboard-key-bg-hover-color: $color-black-3,
27+
keyboard-key-border-hover-color: $color-gray-1,
28+
keyboard-key-text-hover-color: $color-gray-1,
29+
keyboard-key-icon-hover-color: $color-gray-1,
30+
keyboard-key-bg-active-color: $color-blue-2,
31+
keyboard-key-border-active-color: $color-blue-2,
3232
keyboard-key-text-active-color: $color-white-1,
3333
keyboard-key-icon-active-color: $color-white-1,
34-
keyboard-key-bg-hold-color: $color-white-1,
35-
keyboard-key-border-hold-color: $color-gray-2,
34+
keyboard-key-bg-hold-color: $color-black-3,
35+
keyboard-key-border-hold-color: $color-gray-1,
3636
keyboard-key-text-hold-color: $color-blue-2,
3737
keyboard-key-icon-hold-color: $color-blue-2,
3838
);

0 commit comments

Comments
 (0)