From 7c4c03bbd4f0f696c8b4d2ad12bf8605f618efee Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sun, 19 Feb 2023 23:19:41 +0800 Subject: [PATCH] no message --- resources/assets/js/pages/login.vue | 1 + resources/assets/sass/pages/common.scss | 39 +++++++++++++++++++ .../sass/pages/components/chat-input.scss | 9 +++++ .../sass/pages/components/dialog-wrapper.scss | 2 + .../pages/components/team-management.scss | 4 +- resources/assets/sass/pages/page-login.scss | 1 + 6 files changed, 54 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue index c60618c75..b9fd1be15 100644 --- a/resources/assets/js/pages/login.vue +++ b/resources/assets/js/pages/login.vue @@ -546,6 +546,7 @@ export default { this.$store.dispatch("handleClearCache", data).then(this.goNext); }).catch(({data, msg}) => { if (data.code === 'email') { + this.loginType = 'login'; $A.modalWarning(msg); } else { $A.modalError(msg); diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss index cbe6fca1e..25d7add51 100755 --- a/resources/assets/sass/pages/common.scss +++ b/resources/assets/sass/pages/common.scss @@ -21,6 +21,45 @@ body { } } + .form-list { + ol, + ul { + li { + list-style-type: none; + + &::before { + display: inline-block; + white-space: nowrap; + width: 1.2em; + text-align: left; + margin-right: 0.2em; + } + } + } + + ul { + li { + &::before { + content: '\2022'; + font-weight: 900; + } + } + } + + ol { + li { + counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9; + counter-increment: list-0; + + &:before { + width: auto; + min-width: 1.2em; + content: counter(list-0, decimal) '. '; + } + } + } + } + .ivu-badge-count { font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif; } diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss index 6c3aa5404..3c9ec906a 100755 --- a/resources/assets/sass/pages/components/chat-input.scss +++ b/resources/assets/sass/pages/components/chat-input.scss @@ -157,6 +157,15 @@ } } + ol { + li { + &:before { + width: auto; + min-width: 1.2em; + } + } + } + a { &:before, &:after { diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index dd6228e8a..5249b3683 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -550,6 +550,8 @@ counter-increment: list-0; &:before { + width: auto; + min-width: 1.2em; content: counter(list-0, decimal) '. '; } } diff --git a/resources/assets/sass/pages/components/team-management.scss b/resources/assets/sass/pages/components/team-management.scss index d6f19e4c8..94f31d3ad 100644 --- a/resources/assets/sass/pages/components/team-management.scss +++ b/resources/assets/sass/pages/components/team-management.scss @@ -120,8 +120,8 @@ height: 18px; line-height: 18px; padding: 0 4px; - transform: scale(0.8); - transform-origin: right center; + margin-left: 4px; + zoom: 0.8; flex-shrink: 0; overflow: hidden; text-overflow: ellipsis; diff --git a/resources/assets/sass/pages/page-login.scss b/resources/assets/sass/pages/page-login.scss index 04eefcafc..d2b02e024 100644 --- a/resources/assets/sass/pages/page-login.scss +++ b/resources/assets/sass/pages/page-login.scss @@ -27,6 +27,7 @@ } } .login-box { + flex-shrink: 0; position: relative; margin-top: 36px; width: 400px;