diff --git a/nezha-fronted/src/assets/css/common/button.scss b/nezha-fronted/src/assets/css/common/button.scss index 7247315a3..b7f98161e 100644 --- a/nezha-fronted/src/assets/css/common/button.scss +++ b/nezha-fronted/src/assets/css/common/button.scss @@ -61,6 +61,11 @@ min-width: 40px; padding: 0 5px; } +.nz-btn.nz-btn-style-light-new { + background-color: $--button-gray-background-color; + border: 1px solid $--button-gray-border-color; + color: $--button-gray-color; +} .nz-btn.nz-btn-style-normal { /* 新版橙色按钮 */ background: $--button-primary-background-color; color: $--button-primary-color; @@ -77,6 +82,11 @@ color: $--button-gray-color; letter-spacing: 0; } +.nz-btn-style-light-new:hover { + background-color: $--background-color-empty; + border-color: $--color-primary-light-5; + color: $--color-primary; +} .nz-btn.nz-btn-style-normal:hover:not(.nz-btn-disabled) { /* 橙色按钮hover */ background: $--button-primary-hover-background-color; color: $--button-primary-color; diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 8384fb92e..9adf63b63 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -238,9 +238,9 @@ color: $--button-gray-color; } .footer__btn.footer__btn--light:hover:not(.footer__btn--disabled) { - background-color: $--button-gray-hover-background-color; - border: 1px solid $--button-gray-hover-border-color; - color: $--button-gray-hover-color; + background-color: $--background-color-empty; + border-color: $--color-primary-light-5; + color: $--color-primary; } .footer__btn.footer__btn--light:focus:not(.footer__btn--disabled) { background-color: $--button-gray-active-background-color; diff --git a/nezha-fronted/src/assets/css/components/common/elementSet.scss b/nezha-fronted/src/assets/css/components/common/elementSet.scss index 7be92e6dd..6b6bd5fbd 100644 --- a/nezha-fronted/src/assets/css/components/common/elementSet.scss +++ b/nezha-fronted/src/assets/css/components/common/elementSet.scss @@ -34,6 +34,7 @@ margin-top: 12px; width: 100%; height: 300px; + border: 1px solid $--button-gray-border-color !important; } .custom-labels i { color: #04b330; diff --git a/nezha-fronted/src/assets/css/components/common/searchInput.scss b/nezha-fronted/src/assets/css/components/common/searchInput.scss index 3c7bdae79..5b230d706 100644 --- a/nezha-fronted/src/assets/css/components/common/searchInput.scss +++ b/nezha-fronted/src/assets/css/components/common/searchInput.scss @@ -37,20 +37,14 @@ .new-search .search-input-all{ width: 226px !important; min-width: 226px; - background-color: $--input-background-color; - color: rgba(0,0,0,.55); + background-color: lighten($--background-color-base, 10%); + color: $--color-text-regular; height: 30px; line-height: 30px; border-bottom-left-radius: 2px; border-top-left-radius: 2px; display: flex; position: relative; - * { - background-color: $--input-background-color; - } -} -input { - background-color: $--background-color-base; } .search-input-all .btn-retract{ padding: 0 4px; @@ -134,7 +128,7 @@ input { height: auto; border: 1px solid $--border-color-base; background: $--background-color-empty; - color: #2e2e2e; + color: $--color-text-regular; text-align: left; border-radius: 3px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); @@ -148,7 +142,7 @@ input { text-align: center; position: relative; border-bottom: 1px solid $--border-color-base; - color: #2e2e2e; + color: $--color-text-regular; } .localStorage_list_box .list_box_title i{ position: absolute; @@ -174,7 +168,7 @@ input { } .localStorage_list_box ul li span{ - color: #2e2e2e; + color: $--color-text-regular; } .localStorage_list_box ul li .value{ font-weight: 600; @@ -214,7 +208,7 @@ input { padding: 3px; background: $--background-color-base; line-height: 13px; - color: rgba(0,0,0,.55); + color: $--color-text-regular; } .selectinfo_box .select_content{ float: left; @@ -222,7 +216,7 @@ input { height: 13px; padding: 3px; background: darken($--background-color-base, 10%); - color: rgba(0,0,0,0.85); + color: $--color-text-regular; display: flex; } .selectinfo_box .select_content .nz-icon-close{ @@ -249,6 +243,7 @@ input { float: left; padding-left: 5px !important; box-sizing: border-box; + color: $--color-text-regular; outline: none; } .select_input input:focus { @@ -301,7 +296,7 @@ input { box-shadow: none; } .sreach_input input::placeholder{ - color: rgba(0,0,0,0.55) + color: $--color-text-regular; } .input_list{ position: fixed; diff --git a/nezha-fronted/src/assets/css/components/page/config/profile.scss b/nezha-fronted/src/assets/css/components/page/config/profile.scss index d0a995b26..ba9811a6d 100644 --- a/nezha-fronted/src/assets/css/components/page/config/profile.scss +++ b/nezha-fronted/src/assets/css/components/page/config/profile.scss @@ -92,7 +92,7 @@ } } .profile-left__btn { - border: 1px solid $--border-color-base-focus; + border: 1px solid $--button-gray-border-color; border-radius: 4px; background: $--background-color-empty; min-width: 132px; @@ -115,6 +115,23 @@ font-size: 18px } } + .profile-left__btn:hover { + background-color: $--background-color-empty; + border-color: $--color-primary-light-5; + color: $--color-primary; + span { + font-size: 14px; + color: $--color-primary; + text-align: left; + line-height: 22px; + font-weight: 400; + } + i { + color: $--color-primary; + margin-right: 5px; + font-size: 18px + } + } .profile-left__center:nth-of-type(7) { margin-bottom: 0; } @@ -173,9 +190,6 @@ color: $--button-primary-hover-background-color; border: 1px solid $--button-primary-hover-background-color; } - .footer__btn:hover { - opacity: .6; - } .is-disabled,.is-disabled:hover{ color: #C0C4CC; cursor: not-allowed; diff --git a/nezha-fronted/src/assets/css/components/page/config/profileChangePin.scss b/nezha-fronted/src/assets/css/components/page/config/profileChangePin.scss index e35a54c80..679c4be34 100644 --- a/nezha-fronted/src/assets/css/components/page/config/profileChangePin.scss +++ b/nezha-fronted/src/assets/css/components/page/config/profileChangePin.scss @@ -43,9 +43,9 @@ } .footer__btn--light { - background-color: $--background-color-empty; - border: 1px solid $--border-color-base; - color: $--color-text-primary; + background-color: $--button-gray-background-color; + border: 1px solid $--button-gray-border-color; + color: $--button-gray-color; } .footer__btn.footer__btn--light:hover:not(.footer__btn--disabled) { diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index c25b25734..ff23bc061 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -579,6 +579,7 @@ li { } .new-search .el-scrollbar__view { height: calc(100% - 4px); + margin-top: 2px; } .new-search .search-input-all .input-center-box>.el-scrollbar>.el-scrollbar__wrap { overflow-y: hidden; diff --git a/nezha-fronted/src/components/common/elementSet.vue b/nezha-fronted/src/components/common/elementSet.vue index fa31abdd8..c71b4b36b 100644 --- a/nezha-fronted/src/components/common/elementSet.vue +++ b/nezha-fronted/src/components/common/elementSet.vue @@ -27,7 +27,7 @@ {{$t('overall.all')}}
-
- + + +