Skip to content

Commit

Permalink
fix(Menu): Menu side logo style lack docs Menu side logo style (#1602)
Browse files Browse the repository at this point in the history
* fix(Menu): Menu logo style lack docs menu logo style

* ci(Menu): update CI/CD

* feat(list): 优化滚动条样式 (#1601)

* style(Menu): updated

---------

Co-authored-by: Heising <heising@travelconnect.cn>
Co-authored-by: liweijie0812 <674416404@qq.com>
  • Loading branch information
3 people authored Sep 26, 2023
1 parent fbf4c99 commit 9def3fe
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 22 deletions.
16 changes: 0 additions & 16 deletions style/web/components/menu/_docs.less
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,11 @@
}
}

.t-menu__logo {
& > * {
margin-left: 24px;
}
}

.t-is-collapsed {
.t-menu__logo {
& > * {
margin: 0 auto;
}
}
}

.@{d-prefix}-demo-item--menu {
--bg-color-demo: var(--bg-color-demo-secondary);
}

.@{d-prefix}-demo-item--menu-multiple {

.@{d-prefix}-demo-item__body {
overflow: unset;
}
Expand Down Expand Up @@ -144,7 +129,6 @@

:root[theme-mode="dark"] {
.tdesign-demo-item--menu {

.@{d-prefix}-demo-item__body {
background-color: transparent;
}
Expand Down
32 changes: 26 additions & 6 deletions style/web/components/menu/_index.less
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ a.@{prefix}-menu__item {
}
}

.@{prefix}-menu__logo {
& > * {
margin-left: @comp-margin-xxl;
}
}

// head-menu
.@{prefix}-head-menu {
.reset;
Expand Down Expand Up @@ -134,6 +140,7 @@ a.@{prefix}-menu__item {
.@{prefix}-menu__item {
padding: 0 14px;
justify-content: center;

.@{prefix}-menu__item-link {
opacity: 0;
content: "";
Expand Down Expand Up @@ -219,6 +226,12 @@ a.@{prefix}-menu__item {
display: block;
}
}

.@{prefix}-menu__log {
& > * {
margin: 0 auto;
}
}
}

&__inner {
Expand Down Expand Up @@ -250,7 +263,8 @@ a.@{prefix}-menu__item {
.@{prefix}-menu-group {
&__title {
position: relative;
padding: @comp-paddingTB-l @comp-paddingLR-l @comp-paddingTB-xs @comp-paddingLR-l;
padding: @comp-paddingTB-l @comp-paddingLR-l @comp-paddingTB-xs
@comp-paddingLR-l;
color: @menu-menu-group-title-color;
font-size: @menu-extra-font-size;
box-sizing: border-box;
Expand Down Expand Up @@ -401,7 +415,6 @@ a.@{prefix}-menu__item {
}

.@{prefix}-menu__item {

&.@{prefix}-is-active.@{prefix}-is-opened {
background-color: @default-menu-active-color--dark;
color: @menu-item-active-color--dark;
Expand Down Expand Up @@ -556,7 +569,9 @@ a.@{prefix}-menu__item {
color: @menu-item-active-color--light;
}

&:hover:not(.@{prefix}-is-active):not(.@{prefix}-is-opened):not(.@{prefix}-is-disabled) {
&:hover:not(.@{prefix}-is-active):not(.@{prefix}-is-opened):not(
.@{prefix}-is-disabled
) {
background-color: @menu-item-hover-bg--light;
}

Expand Down Expand Up @@ -604,7 +619,9 @@ a.@{prefix}-menu__item {
color: @menu-item-disabled-color-dark;
}

&:hover:not(.@{prefix}-is-active):not(.@{prefix}-is-opened):not(.@{prefix}-is-disabled) {
&:hover:not(.@{prefix}-is-active):not(.@{prefix}-is-opened):not(
.@{prefix}-is-disabled
) {
background-color: @menu-item-hover-bg--dark;
}

Expand Down Expand Up @@ -740,7 +757,8 @@ a.@{prefix}-menu__item {
top: 0;
left: calc(100% - @pop-padding-m);

.@{prefix}-menu__item, .@{prefix}-submenu {
.@{prefix}-menu__item,
.@{prefix}-submenu {
margin: @comp-margin-xxs 0 0 0;

&:first-child {
Expand All @@ -751,7 +769,9 @@ a.@{prefix}-menu__item {

.@{prefix}-is-head-menu {
.@{prefix}-menu__popup {
margin-top: calc((@menu-height-default - @head-menu-item-height) / 2) !important;
margin-top: calc(
(@menu-height-default - @head-menu-item-height) / 2
) !important;
}
}

Expand Down

0 comments on commit 9def3fe

Please sign in to comment.