Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(action-menu):修复action-menu图标和字体颜色统一，添加悬浮效果 #14

Merged
merged 9 commits into from
Mar 2, 2023
Merged

fix(action-menu):修复action-menu图标和字体颜色统一，添加悬浮效果 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a2781d
fix(action-menu):修复action-menu图标和字体颜色统一，添加悬浮效果
MomoPoppy Feb 28, 2023
bacd31e
Merge branch 'opentiny:dev' into MomoPoppy/fix-action-menu
MomoPoppy Feb 28, 2023
4cdbadc
Merge branch 'dev' of https://github.com/MomoPoppy/tiny-vue-theme int…
MomoPoppy Feb 28, 2023
6f20f02
Merge branch 'MomoPoppy/fix-action-menu' of https://github.com/MomoPo…
MomoPoppy Feb 28, 2023
bce03fd
fix(action-menu):修改review意见
MomoPoppy Mar 1, 2023
24ee048
Merge branch 'opentiny:dev' into MomoPoppy/fix-action-menu
MomoPoppy Mar 1, 2023
492e99e
Merge branch 'dev' of https://github.com/MomoPoppy/tiny-vue-theme int…
MomoPoppy Mar 1, 2023
bb38834
Merge branch 'MomoPoppy/fix-action-menu' of https://github.com/MomoPo…
MomoPoppy Mar 1, 2023
822300c
fix(action-menu):修改cssvar变量命名
MomoPoppy Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 36 additions & 14 deletions src/action-menu/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,45 +20,67 @@
.component-css-vars-action-menu();

font-size: var(--ti-action-menu-font-size);
color: var( --ti-action-menu-text-color);
color: var(--ti-action-menu-text-color);

&__wrap{
&__wrap {
display: flex;

.@{action-menu-prefix-cls}__item{
.@{action-menu-prefix-cls}__item {
display: flex;
justify-content: space-between;
align-items: center;

.tiny-svg {
.tiny-svg {
fill: var(--ti-action-menu-text-color);
margin: var(--ti-action-menu-item-svg-margin-top) var(--ti-action-menu-item-svg-margin-right) var(--ti-action-menu-item-svg-margin-bottom) var(--ti-action-menu-item-svg-margin-left);
}

&.@{action-menu-prefix-cls}__item-visable{
.@{dropdown-item-prefix-cls}{
&:hover:not(.is-disabled) {
color: var(--ti-action-menu-item-hover-text-color);

&.@{action-menu-prefix-cls}__item-visable {
.@{dropdown-item-prefix-cls} {
color: var(--ti-action-menu-item-hover-text-color);
}

}

.tiny-svg {
fill: var(--ti-action-menu-item-hover-text-color);
}
}

&.is-disabled:hover{
.@{dropdown-item-prefix-cls} {
color: var(--ti-action-menu-item-disabled-text-color);
}
}

&.@{action-menu-prefix-cls}__item-visable {
.@{dropdown-item-prefix-cls} {
color: var(--ti-action-menu-text-color);
padding: var(--ti-action-menu-item-padding-top) var(--ti-action-menu-item-padding-right) var(--ti-action-menu-item-padding-bottom) var(--ti-action-menu-item-padding-left);

&:hover{
background-color: var( --ti-action-menu-item-hover-bg-color);
&:hover {
background-color: var(--ti-action-menu-item-hover-bg-color);
}
}
}

&.is-disabled{
.@{dropdown-item-prefix-cls}{
&.is-disabled {
.@{dropdown-item-prefix-cls} {
cursor: not-allowed;
color: var(--ti-action-menu-item-disabled-text-color);
}
}
.@{action-menu-prefix-cls}__item-line{

.@{action-menu-prefix-cls}__item-line {
position: relative;
width: 1px;
height: 12px;
background:var(--ti-action-menu-item-line-bg-color);
background: var(--ti-action-menu-item-line-bg-color);
display: inline-block;
}
}
}
}
}
9 changes: 5 additions & 4 deletions src/action-menu/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
*/

.component-css-vars-action-menu() {
--ti-action-menu-text-color: var(--ti-base-color-brand-7);
--ti-action-menu-text-color: var(--ti-common-color-text-link);
--ti-action-menu-font-size: var(--ti-common-font-size-base);
--ti-action-menu-item-line-bg-color: var(--ti-base-color-common-1);
--ti-action-menu-item-disabled-text-color: var(--ti-base-color-common-2);
--ti-action-menu-item-hover-bg-color: var(--ti-base-color-transparent);
--ti-action-menu-item-line-bg-color: var(--ti-common-color-line-dividing);
--ti-action-menu-item-disabled-text-color: var(--ti-common-color-text-disabled);
--ti-action-menu-item-hover-bg-color: var(--ti-common-color-transparent);
--ti-action-menu-item-hover-text-color:var(--ti-common-color-text-link-hover);
--ti-action-menu-item-padding-top: 0;
--ti-action-menu-item-padding-right: 0;
--ti-action-menu-item-padding-bottom: 0;
Expand Down