diff --git a/packages/opendesign/src/button/style/theme-openeuler.scss b/packages/opendesign/src/button/style/theme-openeuler.scss index be1cb63cffbf406841fec4a9ab6d75d54286e89d..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 --- a/packages/opendesign/src/button/style/theme-openeuler.scss +++ b/packages/opendesign/src/button/style/theme-openeuler.scss @@ -1,23 +1 @@ -@use '../../_styles/mixin.scss' as *; -.o-btn.o-btn-solid { - --btn-color: var(--o-color-info1-inverse); - --btn-color-hover: var(--o-color-info1-inverse); - --btn-color-active: var(--o-color-info1-inverse); - --btn-color-disabled: var(--o-color-info1-inverse); -} - -.o-btn-outline.o-btn-primary:not(.o-btn-disabled) { - --btn-color: var(--o-color-info1); - --btn-color-hover: var(--o-color-info1-inverse); - --btn-color-active: var(--o-color-info1-inverse); - --btn-bg-color-hover: var(--o-color-primary2); - --btn-bg-color-active: var(--o-color-primary3); - @include hover { - background-color: var(--btn-bg-color-hover); - } - - &:active { - background-color: var(--btn-bg-color-active); - } -} diff --git a/packages/opendesign/src/card/style/theme-kunpeng.scss b/packages/opendesign/src/card/style/theme-kunpeng.scss index ce0667b64889e2a6d108fe8777a4aec0268d059d..17ba5811780b23c9e1088c958b781375e213e9e4 100644 --- a/packages/opendesign/src/card/style/theme-kunpeng.scss +++ b/packages/opendesign/src/card/style/theme-kunpeng.scss @@ -23,7 +23,7 @@ @include hover { .o-card-icon, .o-card-title-icon { - color: rgb(var(--o-red-huawei)); + color: var(--o-color-main1); } } } @@ -34,7 +34,7 @@ } @include hover { .o-card-title { - color: rgb(var(--o-red-huawei)); + color: var(--o-color-main1); } } } diff --git a/packages/opendesign/src/card/style/theme-openeuler.scss b/packages/opendesign/src/card/style/theme-openeuler.scss index 4eec55eb5179aec329a923e75aa90d71a53d2cdd..387dec07f8fbf7dc529ace8a033429492bf90ab3 100644 --- a/packages/opendesign/src/card/style/theme-openeuler.scss +++ b/packages/opendesign/src/card/style/theme-openeuler.scss @@ -19,7 +19,7 @@ } @include hover { .o-card-title { - color: var(--o-color-primary1); + color: var(--o-color-main1); } } } diff --git a/packages/opendesign/src/scrollbar/style/style.scss b/packages/opendesign/src/scrollbar/style/style.scss index 196adcd31916af5811cdfe7fac22cc90eee4792e..694e74bc44b743afea801607c5522c3233f26584 100644 --- a/packages/opendesign/src/scrollbar/style/style.scss +++ b/packages/opendesign/src/scrollbar/style/style.scss @@ -127,14 +127,16 @@ display: flex; } -.o-scrollbar-x-thumb-bar, -.o-scrollbar-y-thumb-bar { - background-color: var(--scrollbar-thumb-bg-color); - border-radius: var(--scrollbar-thumb-radius); - transition: all var(--o-duration-m1) var(--o-easing-standard-in) var(--scrollbar-delay); - margin: auto; - &.is-dragging { - background-color: var(--scrollbar-thumb-bg-color-hover); +.o-scrollbar-rail { + .o-scrollbar-x-thumb-bar, + .o-scrollbar-y-thumb-bar { + background-color: var(--scrollbar-thumb-bg-color); + border-radius: var(--scrollbar-thumb-radius); + transition: all var(--o-duration-m1) var(--o-easing-standard-in) var(--scrollbar-delay); + margin: auto; + &.is-dragging { + background-color: var(--scrollbar-thumb-bg-color-active); + } } } .o-scrollbar-x-thumb-bar { diff --git a/packages/opendesign/src/scrollbar/style/var.scss b/packages/opendesign/src/scrollbar/style/var.scss index 849b26a3cfebebf341cfac435509300eee4a756e..cf1fdd0c84b57c4349673abf22d7842be643e917 100644 --- a/packages/opendesign/src/scrollbar/style/var.scss +++ b/packages/opendesign/src/scrollbar/style/var.scss @@ -18,7 +18,8 @@ --scrollbar-track-width: 6px; --scrollbar-thumb-bg-color: var(--o-color-control1); - --scrollbar-thumb-bg-color-hover: var(--o-color-control2); + --scrollbar-thumb-bg-color-hover: var(--o-color-info3); + --scrollbar-thumb-bg-color-active: var(--o-color-info2); --scrollbar-thumb-width: 6px; --scrollbar-thumb-width-hover: 10px; --scrollbar-thumb-radius: 10px; diff --git a/packages/opendesign/src/tag/style/theme-ak.scss b/packages/opendesign/src/tag/style/theme-ak.scss index e8deea124f399ba8007227933568f9ea8a3e71bf..b877c1404ccf18c85983e7a019812ec22818e097 100644 --- a/packages/opendesign/src/tag/style/theme-ak.scss +++ b/packages/opendesign/src/tag/style/theme-ak.scss @@ -8,17 +8,17 @@ } } .o-tag-primary { - --tag-bg-color: rgb(var(--o-red-huawei)); - --tag-bd-color: rgb(var(--o-red-huawei)); + --tag-bg-color: var(--o-color-main1); + --tag-bd-color: var(--o-color-main1); &.o-tag-outline { - --tag-color: rgb(var(--o-red-huawei)); + --tag-color: var(--o-color-main1); } } .c-tag-activity, .c-tag-ascend, .c-tag-kunpeng { --tag-color: var(--o-color-white); - background: linear-gradient(90deg, rgb(var(--ak-color-band-start)) 0%, rgb(var(--ak-color-band-end)) 100%); + background: var(--o-color-main2); border: none; }