gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	public/js/app.js
This commit is contained in:
韦荣超 2022-01-21 18:10:53 +08:00
commit 04998d6a60
7 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "DooTask", "name": "DooTask",
"version": "0.6.63", "version": "0.6.65",
"description": "DooTask is task management system.", "description": "DooTask is task management system.",
"main": "main.js", "main": "main.js",
"license": "MIT", "license": "MIT",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "DooTask", "name": "DooTask",
"version": "0.6.63", "version": "0.6.65",
"description": "DooTask is task management system.", "description": "DooTask is task management system.",
"scripts": { "scripts": {
"start": "./cmd dev", "start": "./cmd dev",

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

1
public/js/build/10.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/build/834.js vendored
View File

File diff suppressed because one or more lines are too long

2
resources/assets/js/pages/login.vue
View File

@ -2,7 +2,7 @@
<div class="page-login"> <div class="page-login">
<PageTitle :title="$L('登录')"/> <PageTitle :title="$L('登录')"/>
<div class="login-body"> <div class="login-body">
<div class="login-logo"></div> <div class="login-logo no-dark-mode"></div>
<div class="login-box"> <div class="login-box">
<div class="login-title">{{welcomeTitle}}</div> <div class="login-title">{{welcomeTitle}}</div>

1
resources/assets/sass/dark.scss vendored
View File

@ -19,6 +19,7 @@ body.dark-mode-reverse {
} }
.ivu-select-dropdown, .ivu-select-dropdown,
.ivu-notice-notice,
.ivu-tooltip-inner, .ivu-tooltip-inner,
.ivu-poptip-inner { .ivu-poptip-inner {
border: 1px solid #e3e8ed; border: 1px solid #e3e8ed;