diff --git a/frontend/admin/src/layout/navBars/breadcrumb/userNews.vue b/frontend/admin/src/layout/navBars/breadcrumb/userNews.vue index 99c93c74d..371ae5289 100644 --- a/frontend/admin/src/layout/navBars/breadcrumb/userNews.vue +++ b/frontend/admin/src/layout/navBars/breadcrumb/userNews.vue @@ -214,7 +214,7 @@ function icon(type) { .head-box-title { font-size: 13px; font-weight: 500; - color: #333333; + color: var(--prev-color-text-regular); line-height: 13px; } .head-box-btn { @@ -249,14 +249,14 @@ function icon(type) { .content-box-type { font-size: 13px; font-weight: 500; - color: #333333; + color: var(--prev-color-text-regular); line-height: 13px; } .content-box-msg { margin-top: 6px; font-size: 13px; font-weight: 400; - color: #666666; + color: var(--prev-color-text-primary); line-height: 13px; } .content-box-time { @@ -272,7 +272,7 @@ function icon(type) { .content-box-empty-margin { text-align: center; font-size: 13px; - color: #999999; + color: var(--prev-color-text-secondary); i { color: var(--prev-color-primary); font-size: 60px; diff --git a/frontend/admin/src/layout/navBars/tagsView/tagsView.vue b/frontend/admin/src/layout/navBars/tagsView/tagsView.vue index 8a42b3f59..5800710a6 100644 --- a/frontend/admin/src/layout/navBars/tagsView/tagsView.vue +++ b/frontend/admin/src/layout/navBars/tagsView/tagsView.vue @@ -418,7 +418,7 @@ watch( } .direction:hover { line-height: 34px; - background-color: #f7f2f2; + background-color: var(--prev-color-hover); cursor: pointer; transition: all 0.3s; } diff --git a/frontend/admin/src/styles/style.scss b/frontend/admin/src/styles/style.scss index d8ab145c1..6ac24c02f 100644 --- a/frontend/admin/src/styles/style.scss +++ b/frontend/admin/src/styles/style.scss @@ -20,7 +20,7 @@ .c_label span { margin-left: 10px; - color: #333; + color: var(--prev-color-text-regular); } .c_row-item { @@ -313,7 +313,7 @@ body { .modal-form .el-message-box__header { padding: 15px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--prev-border-color-lighter); display: flex; align-items: center; justify-content: space-between; @@ -323,7 +323,7 @@ body { font-size: 14px; line-height: 14px; font-weight: 500; - color: #303133; + color: var(--prev-color-text-regular); } .modal-form .el-message-box__content { @@ -548,7 +548,7 @@ body { .btn-back { padding: 0 !important; - color: #333 !important; + color: var(--prev-color-text-regular) !important; font-size: 13px; } @@ -647,7 +647,7 @@ body { .i-layout-page-header { margin: 0; /* display: none; */ - background-color: #fff; + background-color: var(--prev-bg-white); padding: 7px 32px 0 32px; } @@ -666,7 +666,7 @@ body { -ms-flex-pack: justify; justify-content: space-between; font-size: 14px; - color: #303133; + color: var(--prev-color-text-regular); } /* 页面标题头「标题行」:返回钮 + 标题 + 描述,基线对齐(描述字号小于标题,用 baseline 不用 flex-end) */ @@ -693,7 +693,7 @@ body { .statics-header-title { font-size: 14px; - color: #303133; + color: var(--prev-color-text-regular); display: -webkit-box; display: -ms-flexbox; display: flex; @@ -707,7 +707,7 @@ body { .ivu-page-header-title { display: inline-block; - color: #17233d; + color: var(--prev-color-text-regular); font-weight: 500; font-size: 18px; line-height: 32px; @@ -717,13 +717,13 @@ body { padding: 16px; height: calc(100% - 80px); overflow: auto; - background-color: #f5f7f9; + background-color: var(--prev-bg-color); } .left-wrapper { height: calc(100vh - 120px); - background: #fff; - border-right: 1px solid #f2f2f2; + background: var(--prev-bg-white); + border-right: 1px solid var(--prev-border-color-lighter); } .ivu-tabs-bar { @@ -1017,7 +1017,7 @@ body { word-break: break-word; height: 47px; background: var(--prev-color-primary-light-9); - color: #515a6e; + color: var(--prev-color-text-primary); font-size: 12px; font-weight: 500; } @@ -1050,7 +1050,7 @@ a { .tree_tit { font-size: 14px; - color: #606266; + color: var(--prev-color-text-primary); font-weight: 500; padding: 23px 0 23px 20px; display: flex; @@ -1086,7 +1086,7 @@ a { .file-name { display: flex; align-items: center; - color: #303133; + color: var(--prev-color-text-regular); font-size: 14px; .text { diff --git a/frontend/admin/src/theme/element.scss b/frontend/admin/src/theme/element.scss index babbf8fca..7d30c649b 100644 --- a/frontend/admin/src/theme/element.scss +++ b/frontend/admin/src/theme/element.scss @@ -91,7 +91,7 @@ } .el-dialog__header { - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--prev-border-color-lighter); padding: 15px !important; display: flex; align-items: center; @@ -101,8 +101,7 @@ .el-dialog__title { font-size: 14px !important; font-weight: 500; - font-weight: 500; - color: #303133; + color: var(--prev-color-text-regular); line-height: 14px !important; } @@ -163,7 +162,7 @@ ------------------------------- */ .el-table__body tr.current-row > td.el-table__cell, .vxe-table--render-default .vxe-body--row.row--current { - background-color: #f5f7fa !important; + background-color: var(--prev-bg-color) !important; } .hover-row .el-select-dropdown .el-scrollbar__wrap, @@ -448,18 +447,18 @@ word-break: break-all; } -// tooltip +// tooltip(边框/箭头同色,用令牌:深色下自动变暗) .el-popper.is-light { - border-color: #f2f2f2 !important; + border-color: var(--prev-border-color-light) !important; } .el-popper .el-popper__arrow, .el-popper .el-popper__arrow::after { - color: #f2f2f2 !important; + color: var(--prev-border-color-light) !important; } .el-popper .el-popper__arrow { - border-bottom-color: #f2f2f2 !important; + border-bottom-color: var(--prev-border-color-light) !important; } // 下拉菜单 diff --git a/frontend/admin/src/theme/variables.scss b/frontend/admin/src/theme/variables.scss index a4260fb23..00489eed2 100644 --- a/frontend/admin/src/theme/variables.scss +++ b/frontend/admin/src/theme/variables.scss @@ -299,7 +299,7 @@ body { } .el-input .el-input__count .el-input__count-inner { - background-color: #fff !important; + background-color: var(--prev-bg-white) !important; } // autocomplete @@ -344,7 +344,7 @@ body { .el-input-group__prepend .el-select .el-input--suffix .el-input__inner::placeholder, .el-cascader .el-input .el-icon-arrow-down, .el-select .el-input .el-select__caret { - color: #606266; + color: var(--prev-color-text-primary); } .el-select-dropdown__item.selected { @@ -678,7 +678,8 @@ body { .el-table th.el-table__cell.is-leaf, .el-table--border, .el-table--group { - border-color: #f5f5f5 !important; + /* 行分隔线用令牌:深色下跟随 --prev-border-color-lighter 变暗(原 #f5f5f5 深色下刺眼) */ + border-color: var(--prev-border-color-lighter) !important; } .el-table th.el-table__cell, @@ -711,7 +712,7 @@ body { .vxe-header--column { font-weight: 500; - color: #303133; + color: var(--prev-color-text-primary); } .el-table .el-table__header-wrapper { @@ -723,7 +724,7 @@ body { // 仅默认主色 tag 使用主题蓝;success/danger/warning/info 语义色恢复 Element Plus 默认配色 .el-tag:not(.el-tag--success):not(.el-tag--warning):not(.el-tag--danger):not(.el-tag--info) { color: var(--prev-color-primary); - background-color: #fff; + background-color: var(--prev-bg-white); border-color: var(--prev-color-primary); } @@ -992,7 +993,7 @@ body { .el-dropdown-menu { background-color: var(--prev-bg-white); - border-color: #ebeef5; + border-color: var(--prev-border-color-lighter); } .el-dropdown-menu__item { @@ -1223,7 +1224,7 @@ body { .el-drawer__header > :first-child { font-size: 14px; font-weight: 500; - color: #303133; + color: var(--prev-color-text-regular); line-height: 14px; }