diff --git a/frontend/package.json b/frontend/package.json index 4a8e29af6..f885bf86b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -72,7 +72,7 @@ "postcss-html": "^1.4.1", "prettier": "^2.6.2", "rollup-plugin-visualizer": "^5.5.4", - "sass": "^1.49.7", + "sass": "^1.77.8", "standard-version": "^9.5.0", "stylelint": "^15.10.1", "tailwindcss": "^3.4.1", diff --git a/frontend/src/components/router-button/index.vue b/frontend/src/components/router-button/index.vue index 3d487ed8e..98a4361b6 100644 --- a/frontend/src/components/router-button/index.vue +++ b/frontend/src/components/router-button/index.vue @@ -86,6 +86,7 @@ onMounted(() => { background-color: var(--panel-button-active) !important; box-shadow: none !important; border: 2px solid transparent !important; + color: var(--el-text-color-regular) !important; } .el-radio-button__original-radio:checked + .el-radio-button__inner { diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss index f6a3cead5..851c448c3 100644 --- a/frontend/src/styles/common.scss +++ b/frontend/src/styles/common.scss @@ -361,15 +361,16 @@ html { .el-input-group__append { border-left: 0; - &:hover { - color: var(--el-color-primary); - background-color: var(--el-color-primary-light-9) !important; - } background-color: #ffffff !important; border-top-left-radius: 0; border-bottom-left-radius: 0; box-shadow: 0 1px 0 0 var(--el-input-border-color) inset, 0 -1px 0 0 var(--el-input-border-color) inset, -1px 0 0 0 var(--el-input-border-color) inset; + + &:hover { + color: var(--el-color-primary); + background-color: var(--el-color-primary-light-9) !important; + } } .tag-button { diff --git a/frontend/src/styles/element-dark.scss b/frontend/src/styles/element-dark.scss index ff581edc1..c2116f809 100644 --- a/frontend/src/styles/element-dark.scss +++ b/frontend/src/styles/element-dark.scss @@ -80,10 +80,6 @@ html.dark { border: 1px solid var(--panel-border-color); } - // * wangEditor - --w-e-textarea-bg-color: #1b1b1b; - --w-e-textarea-color: #eeeeee; - .md-editor-dark { --md-bk-color: #111417; } @@ -251,14 +247,16 @@ html.dark { color: rgb(174, 166, 153); } .el-dialog { + border: 1px solid var(--panel-border-color); + .el-dialog__header { border-bottom: var(--panel-border); color: #999999; + .el-dialog__title { color: var(--el-menu-text-color); } } - border: 1px solid var(--panel-border-color); } .el-tabs__item { color: #999999; @@ -330,15 +328,16 @@ html.dark { .el-input-group__append { border-left: 0; - &:hover { - color: var(--el-color-primary); - background-color: var(--el-color-primary-light-9) !important; - } background-color: #212426 !important; border-top-left-radius: 0; border-bottom-left-radius: 0; box-shadow: 0 1px 0 0 var(--el-input-border-color) inset, 0 -1px 0 0 var(--el-input-border-color) inset, -1px 0 0 0 var(--el-input-border-color) inset; + + &:hover { + color: var(--el-color-primary); + background-color: var(--el-color-primary-light-9) !important; + } } .el-collapse-item__header { diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index a5bb13bfc..9522215d9 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -173,12 +173,13 @@ html { } .el-dialog { + border-radius: 5px; + .el-dialog__header { .el-dialog__title { font-size: 17px; } } - border-radius: 5px; } .row-box {