From 13501eb066c9d7990872555f31bf8098428aaa35 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 30 May 2022 19:23:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/sass/components/report.scss | 2 +- resources/assets/sass/components/right-bottom.scss | 2 +- resources/assets/sass/pages/common.scss | 2 +- .../sass/pages/components/dialog-group-info.scss | 2 +- .../sass/pages/components/dialog-wrapper.scss | 14 +++++++------- .../assets/sass/pages/components/file-content.scss | 4 ++-- .../sass/pages/components/project-archived.scss | 2 +- .../sass/pages/components/project-gantt.scss | 2 +- .../assets/sass/pages/components/project-list.scss | 4 ++-- .../assets/sass/pages/components/project-log.scss | 4 ++-- .../sass/pages/components/project-management.scss | 2 +- .../sass/pages/components/project-panel.scss | 10 +++++----- .../sass/pages/components/project-workflow.scss | 2 +- .../sass/pages/components/task-add-simple.scss | 2 +- .../assets/sass/pages/components/task-add.scss | 2 +- .../sass/pages/components/task-archived.scss | 2 +- .../assets/sass/pages/components/task-deleted.scss | 2 +- .../assets/sass/pages/components/task-detail.scss | 8 ++++---- .../sass/pages/components/team-management.scss | 2 +- resources/assets/sass/pages/page-calendar.scss | 2 +- resources/assets/sass/pages/page-dashboard.scss | 2 +- resources/assets/sass/pages/page-file.scss | 4 ++-- resources/assets/sass/pages/page-index.scss | 2 +- resources/assets/sass/pages/page-login.scss | 4 ++-- resources/assets/sass/pages/page-manage.scss | 4 ++-- resources/assets/sass/pages/page-messenger.scss | 6 +++--- resources/assets/sass/pages/page-setting.scss | 4 ++-- resources/assets/sass/var.scss | 1 + 28 files changed, 50 insertions(+), 49 deletions(-) diff --git a/resources/assets/sass/components/report.scss b/resources/assets/sass/components/report.scss index 2229dc4eb..ea6313a8a 100644 --- a/resources/assets/sass/components/report.scss +++ b/resources/assets/sass/components/report.scss @@ -119,7 +119,7 @@ padding: 24px; .ivu-input[disabled] { - color: #666666; + color: $primary-text-color; } .report-content { diff --git a/resources/assets/sass/components/right-bottom.scss b/resources/assets/sass/components/right-bottom.scss index 9ef902370..978e9804e 100644 --- a/resources/assets/sass/components/right-bottom.scss +++ b/resources/assets/sass/components/right-bottom.scss @@ -74,7 +74,7 @@ } .notification-tip { display: inline-block; - color: #999999; + color: $primary-desc-color; line-height: 22px; padding-top: 4px; font-size: 12px; diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss index ecc10177d..1ed5f9647 100755 --- a/resources/assets/sass/pages/common.scss +++ b/resources/assets/sass/pages/common.scss @@ -13,7 +13,7 @@ body { } .form-tip { - color: #999999; + color: $primary-desc-color; line-height: 22px; padding: 5px 0; } diff --git a/resources/assets/sass/pages/components/dialog-group-info.scss b/resources/assets/sass/pages/components/dialog-group-info.scss index b58d8ff75..341f162ce 100644 --- a/resources/assets/sass/pages/components/dialog-group-info.scss +++ b/resources/assets/sass/pages/components/dialog-group-info.scss @@ -104,7 +104,7 @@ width: 22px; height: 22px; font-size: 12px; - color: #999999; + color: $primary-desc-color; border: 1px solid #dddddd; border-radius: 50%; opacity: 0; diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index a2c07dd8d..6c7358751 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -280,7 +280,7 @@ } .content-text { - color: #333333; + color: $primary-title-color; padding: 2px; > pre { @@ -412,7 +412,7 @@ justify-content: center; .file-name { - color: #333333; + color: $primary-title-color; font-size: 14px; line-height: 18px; word-break: break-all; @@ -425,7 +425,7 @@ .file-size { padding-top: 4px; - color: #666666; + color: $primary-text-color; font-size: 14px; } } @@ -456,7 +456,7 @@ flex-direction: row-reverse; justify-content: flex-end; align-content: center; - color: #333333; + color: $primary-title-color; line-height: 22px; cursor: pointer; @@ -641,7 +641,7 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - color: #999999; + color: $primary-desc-color; } &.bottom { @@ -669,7 +669,7 @@ > pre { .mention { - color: #333333; + color: $primary-title-color; &.me { font-size: 14px; @@ -810,7 +810,7 @@ .drag-text { padding: 12px; font-size: 18px; - color: #666666; + color: $primary-text-color; } } } diff --git a/resources/assets/sass/pages/components/file-content.scss b/resources/assets/sass/pages/components/file-content.scss index 79b891de4..50682bee7 100644 --- a/resources/assets/sass/pages/components/file-content.scss +++ b/resources/assets/sass/pages/components/file-content.scss @@ -71,7 +71,7 @@ z-index: 99; .header-title { flex: 1; - color: #333333; + color: $primary-title-color; padding-left: 24px; padding-right: 24px; line-height: 24px; @@ -80,7 +80,7 @@ text-overflow:ellipsis; white-space: nowrap; .file-unsave-tip { - color: #333333; + color: $primary-title-color; padding-right: 6px; font-weight: 500; cursor: pointer; diff --git a/resources/assets/sass/pages/components/project-archived.scss b/resources/assets/sass/pages/components/project-archived.scss index a0b3ddcd1..69d5b7c8e 100644 --- a/resources/assets/sass/pages/components/project-archived.scss +++ b/resources/assets/sass/pages/components/project-archived.scss @@ -9,7 +9,7 @@ flex-direction: column; .archived-title { - color: #333333; + color: $primary-title-color; font-size: 20px; font-weight: 500; line-height: 1; diff --git a/resources/assets/sass/pages/components/project-gantt.scss b/resources/assets/sass/pages/components/project-gantt.scss index 350fbb39b..719e99d43 100644 --- a/resources/assets/sass/pages/components/project-gantt.scss +++ b/resources/assets/sass/pages/components/project-gantt.scss @@ -39,7 +39,7 @@ } i { - color: #666666; + color: $primary-text-color; font-size: 28px; transform: scale(0.92); transition: all .2s; diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss index b6a97deb2..9683965ae 100644 --- a/resources/assets/sass/pages/components/project-list.scss +++ b/resources/assets/sass/pages/components/project-list.scss @@ -111,7 +111,7 @@ .project-name { font-size: 14px; line-height: 22px; - color: #333333; + color: $primary-title-color; word-break: break-all; text-overflow: ellipsis; overflow: hidden; @@ -158,7 +158,7 @@ display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; - color: #999999; + color: $primary-desc-color; } } .item-right { diff --git a/resources/assets/sass/pages/components/project-log.scss b/resources/assets/sass/pages/components/project-log.scss index b15c09a59..f2d43b5a3 100644 --- a/resources/assets/sass/pages/components/project-log.scss +++ b/resources/assets/sass/pages/components/project-log.scss @@ -13,7 +13,7 @@ overflow: auto; .log-title { - color: #333333; + color: $primary-title-color; font-size: 20px; font-weight: 500; line-height: 1; @@ -174,7 +174,7 @@ line-height: 18px; height: 18px; max-width: 100%; - color: #999999; + color: $primary-desc-color; border-radius: 5px; overflow: hidden; text-overflow: ellipsis; diff --git a/resources/assets/sass/pages/components/project-management.scss b/resources/assets/sass/pages/components/project-management.scss index a7893888f..529990697 100644 --- a/resources/assets/sass/pages/components/project-management.scss +++ b/resources/assets/sass/pages/components/project-management.scss @@ -9,7 +9,7 @@ flex-direction: column; .management-title { - color: #333333; + color: $primary-title-color; font-size: 20px; font-weight: 500; line-height: 1; diff --git a/resources/assets/sass/pages/components/project-panel.scss b/resources/assets/sass/pages/components/project-panel.scss index 7b2a7e219..9a8b1245c 100644 --- a/resources/assets/sass/pages/components/project-panel.scss +++ b/resources/assets/sass/pages/components/project-panel.scss @@ -13,7 +13,7 @@ display: none; } > h1 { - color: #333333; + color: $primary-title-color; font-size: 28px; font-weight: 600; } @@ -136,7 +136,7 @@ padding: 0 32px; .project-subtitle { float: left; - color: #999999; + color: $primary-desc-color; line-height: 24px; margin: 6px 0; } @@ -479,7 +479,7 @@ } .task-desc { > pre { - color: #999999; + color: $primary-desc-color; padding: 0; margin: 10px 0 0 0; line-height: 20px; @@ -721,7 +721,7 @@ &.row-title { font-size: 14px; font-weight: 500; - color: #333333; + color: $primary-title-color; padding-left: 14px; .taskfont { cursor: pointer; @@ -732,7 +732,7 @@ padding-left: 18px; } .row-num { - color: #999999; + color: $primary-desc-color; padding-left: 6px; } } diff --git a/resources/assets/sass/pages/components/project-workflow.scss b/resources/assets/sass/pages/components/project-workflow.scss index 1e10e0a22..657ea1f80 100644 --- a/resources/assets/sass/pages/components/project-workflow.scss +++ b/resources/assets/sass/pages/components/project-workflow.scss @@ -7,7 +7,7 @@ display: flex; flex-direction: column; .workflow-title { - color: #333333; + color: $primary-title-color; font-size: 20px; font-weight: 500; line-height: 1; diff --git a/resources/assets/sass/pages/components/task-add-simple.scss b/resources/assets/sass/pages/components/task-add-simple.scss index 6e8bc13eb..e1071a124 100644 --- a/resources/assets/sass/pages/components/task-add-simple.scss +++ b/resources/assets/sass/pages/components/task-add-simple.scss @@ -12,7 +12,7 @@ margin-right: 4px; } &:hover { - color: #666666; + color: $primary-text-color; } } .priority { diff --git a/resources/assets/sass/pages/components/task-add.scss b/resources/assets/sass/pages/components/task-add.scss index 713a1c810..a4e5b97cb 100644 --- a/resources/assets/sass/pages/components/task-add.scss +++ b/resources/assets/sass/pages/components/task-add.scss @@ -198,7 +198,7 @@ justify-content: flex-end; .ivu-icon { font-size: 16px; - color: #999999; + color: $primary-desc-color; } } .ivu-modal-footer { diff --git a/resources/assets/sass/pages/components/task-archived.scss b/resources/assets/sass/pages/components/task-archived.scss index c152090ff..2ae34e4fc 100644 --- a/resources/assets/sass/pages/components/task-archived.scss +++ b/resources/assets/sass/pages/components/task-archived.scss @@ -9,7 +9,7 @@ flex-direction: column; .archived-title { - color: #333333; + color: $primary-title-color; font-size: 20px; font-weight: 500; line-height: 1; diff --git a/resources/assets/sass/pages/components/task-deleted.scss b/resources/assets/sass/pages/components/task-deleted.scss index 6f239c9a8..b0d15d216 100644 --- a/resources/assets/sass/pages/components/task-deleted.scss +++ b/resources/assets/sass/pages/components/task-deleted.scss @@ -9,7 +9,7 @@ flex-direction: column; .deleted-title { - color: #333333; + color: $primary-title-color; font-size: 20px; font-weight: 500; line-height: 1; diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss index b3fde1550..c5ef18d4f 100644 --- a/resources/assets/sass/pages/components/task-detail.scss +++ b/resources/assets/sass/pages/components/task-detail.scss @@ -479,7 +479,7 @@ } } &:hover { - color: #999999; + color: $primary-desc-color; } } } @@ -521,7 +521,7 @@ align-items: center; padding-left: 18px; font-weight: 500; - color: #666666; + color: $primary-text-color; > p { display: flex; align-items: center; @@ -628,7 +628,7 @@ .drag-text { padding: 12px; font-size: 18px; - color: #666666; + color: $primary-text-color; } } } @@ -721,7 +721,7 @@ align-items: center; justify-content: center; margin-left: 18px; - color: #999999; + color: $primary-desc-color; } .no-input { margin: 0 0 0 18px; diff --git a/resources/assets/sass/pages/components/team-management.scss b/resources/assets/sass/pages/components/team-management.scss index 0991eeb74..41944b34a 100644 --- a/resources/assets/sass/pages/components/team-management.scss +++ b/resources/assets/sass/pages/components/team-management.scss @@ -9,7 +9,7 @@ flex-direction: column; .management-title { - color: #333333; + color: $primary-title-color; font-size: 20px; font-weight: 500; line-height: 1; diff --git a/resources/assets/sass/pages/page-calendar.scss b/resources/assets/sass/pages/page-calendar.scss index d583251c9..d5c15426e 100644 --- a/resources/assets/sass/pages/page-calendar.scss +++ b/resources/assets/sass/pages/page-calendar.scss @@ -17,7 +17,7 @@ align-items: center; margin-right: 36px; > h1 { - color: #333333; + color: $primary-title-color; font-size: 28px; font-weight: 600; } diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss index aaf994c15..a608c0e61 100644 --- a/resources/assets/sass/pages/page-dashboard.scss +++ b/resources/assets/sass/pages/page-dashboard.scss @@ -24,7 +24,7 @@ } .dashboard-hello { padding: 6% 12px 0; - color: #333333; + color: $primary-title-color; font-size: 24px; font-weight: 600; word-wrap: break-word; diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss index eabbd04a4..1985db7d1 100644 --- a/resources/assets/sass/pages/page-file.scss +++ b/resources/assets/sass/pages/page-file.scss @@ -20,7 +20,7 @@ display: flex; align-items: center; > h1 { - color: #333333; + color: $primary-title-color; font-size: 28px; font-weight: 600; } @@ -476,7 +476,7 @@ .drag-text { padding: 12px; font-size: 18px; - color: #666666; + color: $primary-text-color; } } } diff --git a/resources/assets/sass/pages/page-index.scss b/resources/assets/sass/pages/page-index.scss index f6ee0fd45..c57de8aca 100644 --- a/resources/assets/sass/pages/page-index.scss +++ b/resources/assets/sass/pages/page-index.scss @@ -202,7 +202,7 @@ h3 { font-size: 32px; font-weight: 500; - color: #333333; + color: $primary-title-color; line-height: 45px; margin-bottom: 17px; } diff --git a/resources/assets/sass/pages/page-login.scss b/resources/assets/sass/pages/page-login.scss index 298922495..a55bd5354 100644 --- a/resources/assets/sass/pages/page-login.scss +++ b/resources/assets/sass/pages/page-login.scss @@ -119,7 +119,7 @@ display: flex; align-items: center; cursor: pointer; - color: #666666; + color: $primary-text-color; .taskfont { margin-top: 1px; margin-left: 3px; @@ -136,7 +136,7 @@ align-items: center; justify-content: space-between; .ivu-icon { - color: #666666; + color: $primary-text-color; padding-left: 6px; margin-right: -6px; } diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss index b05d48afe..1dfe1b3ac 100644 --- a/resources/assets/sass/pages/page-manage.scss +++ b/resources/assets/sass/pages/page-manage.scss @@ -104,7 +104,7 @@ } .title { flex: 1; - color: #333333; + color: $primary-title-color; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -338,7 +338,7 @@ align-items: center; justify-content: space-between; .ivu-icon { - color: #666666; + color: $primary-text-color; } } diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss index fb89e0026..0055d06cf 100644 --- a/resources/assets/sass/pages/page-messenger.scss +++ b/resources/assets/sass/pages/page-messenger.scss @@ -154,7 +154,7 @@ } > span { flex: 1; - color: #333333; + color: $primary-title-color; font-size: 14px; white-space: nowrap; overflow: hidden; @@ -176,12 +176,12 @@ flex-shrink: 0; margin-left: 8px; font-style: normal; - color: #999999; + color: $primary-desc-color; font-size: 12px; } } .dialog-text { - color: #999999; + color: $primary-desc-color; font-size: 12px; line-height: 24px; display: flex; diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss index 77e0e87f4..0ee183074 100755 --- a/resources/assets/sass/pages/page-setting.scss +++ b/resources/assets/sass/pages/page-setting.scss @@ -14,7 +14,7 @@ align-items: center; > h1 { flex: 1; - color: #333333; + color: $primary-title-color; font-size: 28px; font-weight: 600; } @@ -142,7 +142,7 @@ } } .information { - color: #999999; + color: $primary-desc-color; } } .setting-template { diff --git a/resources/assets/sass/var.scss b/resources/assets/sass/var.scss index 4b6150baa..64ae8073c 100644 --- a/resources/assets/sass/var.scss +++ b/resources/assets/sass/var.scss @@ -1,6 +1,7 @@ $primary-color: #84C56A; $primary-title-color: #303133; $primary-text-color: #606266; +$primary-desc-color: #909399; $flow-status-archived-color: #7f7f7f; $flow-status-start-color: #FF7070;