Skip to content

Commit

Permalink
refactor(colorMode): add default
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhaocl1997 committed Aug 19, 2022
1 parent ddb329f commit e1efd02
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,10 @@
"enum": [
"cafe",
"contrast",
"grayscale"
"default",
"grayscale",
"grayscale-inverted",
"inverted"
],
"type": "string"
},
Expand Down
12 changes: 2 additions & 10 deletions src/components/Extra/Flipper/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,11 @@
@mouseenter="onMouseEnterAndLeave"
@mouseleave="onMouseEnterAndLeave"
>
<div
v-if="!flipped"
class="Flipper__face Flipper__face--front"
:style="getStyle.face"
>
<div class="Flipper__face Flipper__face--front" :style="getStyle.face">
<slot name="front" />
</div>

<div
v-else
class="Flipper__face Flipper__face--back"
:style="getStyle.face"
>
<div class="Flipper__face Flipper__face--back" :style="getStyle.face">
<slot name="back" />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Extra/Password/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:value="value"
type="password"
show-password-on="click"
placeholder="Please input your password"
:placeholder="$attrs.placeholder"
:maxlength="maxlength"
:minlength="minlength"
clearable
Expand Down
1 change: 1 addition & 0 deletions src/const/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export type ValueOfAppConstAnimationMode =
typeof AppConstAnimationMode[keyof typeof AppConstAnimationMode]

export const AppConstColorMode = {
DEFAULT: 'default',
CAFE: 'cafe',
CONTRAST: 'contrast',
GRAYSCALE: 'grayscale',
Expand Down
3 changes: 2 additions & 1 deletion src/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"idleMS": 60000,
"contentPadding": 10,
"showWatermark": false,
"watermarkContent": "walnut-admin"
"watermarkContent": "walnut-admin",
"colorMode": "default"
},
"menu": {
"showCollapse": true,
Expand Down

0 comments on commit e1efd02

Please sign in to comment.