diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index fb7434b..4e8e158 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -148,6 +148,7 @@ export default { 'My work.': 'My work.', 'Copy from existing proposals': 'Copy from existing proposals', Copy: 'Copy', + Choose: 'Choose', 'Apply proposal template': 'Apply proposal template', Proposal: 'Proposal', Milestones: 'Milestones', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e1128e4..dfe00b8 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -147,6 +147,7 @@ export default { 'My work.': '我的工作', 'Copy from existing proposals': '从现有提案中拷贝', Copy: '拷贝', + Choose: '选择', 'Apply proposal template': '应用提案模版', Proposal: '报价', Milestones: '项目阶段', diff --git a/frontend/src/pages/guest/SigninWithEmailAndCode.vue b/frontend/src/pages/guest/SigninWithEmailAndCode.vue index 2ef44c6..b65fd6e 100644 --- a/frontend/src/pages/guest/SigninWithEmailAndCode.vue +++ b/frontend/src/pages/guest/SigninWithEmailAndCode.vue @@ -9,30 +9,18 @@
- +

{{ message }}

-

- {{ $t("Didn't get the email? Check junk folder or") }} - +

+ {{ $t('Didn\'t get the email? Check junk folder or') }} + ({{ countdown }})

@@ -64,7 +52,7 @@ export default { } }, - created() {}, + created() { }, mounted() { if (this.mnx_IsKeepUserSignedIn() && this.mnx_isUserAuthenticated()) { this.mnx_navAfterSignedin() @@ -162,4 +150,9 @@ export default { .countdown { color: $primary; } + +.msg-center { + display: flex; + align-items: center; +} diff --git a/frontend/src/pages/user/account/UserProfile.vue b/frontend/src/pages/user/account/UserProfile.vue index 4f4010f..f539859 100644 --- a/frontend/src/pages/user/account/UserProfile.vue +++ b/frontend/src/pages/user/account/UserProfile.vue @@ -468,14 +468,14 @@

@@ -1542,6 +1542,13 @@ export default { width: fit-content; } +.select-template-button { + @extend .btn; + @extend .btn-link; + @extend .float-end; + width: fit-content; +} + .user-mobile-operation-verified-button { @extend .initiate-button; } @@ -1947,4 +1954,8 @@ export default { .offcanvas-parent { position: relative; } + +.offcanvas-container { + width: 60% !important; +} diff --git a/frontend/src/pages/user/workspace/Home.vue b/frontend/src/pages/user/workspace/Home.vue index 91d2ae8..cd1ca40 100644 --- a/frontend/src/pages/user/workspace/Home.vue +++ b/frontend/src/pages/user/workspace/Home.vue @@ -1074,6 +1074,9 @@ export default { .project-request-container { // padding: 32px; + padding-top: 12px; + margin-top: -12px; + border-top: 1px solid #e1e1e1 } .float-action-container { @@ -1586,14 +1589,18 @@ export default { .project-milestones-table-btn { @extend .btn; @extend .btn-primary; + border-color: #1748f8; + background-color: rgba(23,72,248,0.1); + color: #1748f8; width: fit-content; padding: 0 8px; - border-radius: 0; + border-radius: 2px; &:disabled { - color: #000000; - border-color: #d9d9d9; - background-color: #d9d9d9; + color: #666666; + border-color: white; + background-color: white; + padding: 0; opacity: 1; } } diff --git a/frontend/src/pages/user/workspace/requestIssue/Issue.vue b/frontend/src/pages/user/workspace/requestIssue/Issue.vue index de42e51..58dabd6 100644 --- a/frontend/src/pages/user/workspace/requestIssue/Issue.vue +++ b/frontend/src/pages/user/workspace/requestIssue/Issue.vue @@ -22,8 +22,8 @@
-
@@ -412,6 +412,13 @@ export default { @extend .w-100; } +.copy-existing-button { + @extend .btn; + @extend .btn-link; + @extend .float-end; + width: fit-content; +} + .tag-box-body { @extend .flex-row-container; @extend .justify-content-start;