Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # public/js/app.js
This commit is contained in:
commit
04998d6a60
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "DooTask",
|
||||
"version": "0.6.63",
|
||||
"version": "0.6.65",
|
||||
"description": "DooTask is task management system.",
|
||||
"main": "main.js",
|
||||
"license": "MIT",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "DooTask",
|
||||
"version": "0.6.63",
|
||||
"version": "0.6.65",
|
||||
"description": "DooTask is task management system.",
|
||||
"scripts": {
|
||||
"start": "./cmd dev",
|
||||
|
2
public/css/app.css
vendored
2
public/css/app.css
vendored
File diff suppressed because one or more lines are too long
1
public/js/build/10.js
vendored
Normal file
1
public/js/build/10.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
public/js/build/834.js
vendored
1
public/js/build/834.js
vendored
File diff suppressed because one or more lines are too long
@ -2,7 +2,7 @@
|
||||
<div class="page-login">
|
||||
<PageTitle :title="$L('登录')"/>
|
||||
<div class="login-body">
|
||||
<div class="login-logo"></div>
|
||||
<div class="login-logo no-dark-mode"></div>
|
||||
<div class="login-box">
|
||||
<div class="login-title">{{welcomeTitle}}</div>
|
||||
|
||||
|
1
resources/assets/sass/dark.scss
vendored
1
resources/assets/sass/dark.scss
vendored
@ -19,6 +19,7 @@ body.dark-mode-reverse {
|
||||
}
|
||||
|
||||
.ivu-select-dropdown,
|
||||
.ivu-notice-notice,
|
||||
.ivu-tooltip-inner,
|
||||
.ivu-poptip-inner {
|
||||
border: 1px solid #e3e8ed;
|
||||
|
Loading…
x
Reference in New Issue
Block a user