Skip to content

feat(nav-menu): [nav-menu] updata nav-menu xdesign #1849

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

Merged
merged 3 commits into from
Aug 7, 2024
Merged

feat(nav-menu): [nav-menu] updata nav-menu xdesign #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a1ece8
feat(nav-menu): [nav-menu] updata nav-menu xdesign
wuyiping0628 Aug 6, 2024
c61521f
feat(nav-menu): [nav-menu] updata nav-menu xdesign
wuyiping0628 Aug 6, 2024
0da06bb
feat(nav-menu): [nav-menu] updata nav-menu xdesign
wuyiping0628 Aug 6, 2024
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
5 changes: 0 additions & 5 deletions examples/sites/demos/pc/app/nav-menu/slot-logo-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,4 @@ const TinyIconTotal = iconTotal()
.preview {
min-height: 450px;
}

.preview .icon-logo {
fill: white;
font-size: 24px;
}
</style>
5 changes: 0 additions & 5 deletions examples/sites/demos/pc/app/nav-menu/slot-logo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,4 @@ export default {
.preview {
min-height: 450px;
}

.preview .icon-logo {
fill: white;
font-size: 24px;
}
</style>
41 changes: 33 additions & 8 deletions packages/theme/src/nav-menu/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,20 @@
background: var(--ti-nav-menu-bg-color);
height: var(--ti-nav-menu-height);
position: relative;
padding: 0 24px;
padding: 0 var(--ti-nav-menu-padding);
box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.10);

> .slot-logo {
float: left;
overflow: hidden;
margin: 0 100px 0 0;
margin: 0 var(--ti-nav-menu-slot-logo-margin-right) 0 var(--ti-nav-menu-slot-logo-margin-left);
line-height: var(--ti-nav-menu-height);
}

.preview .slot-logo .icon-logo {
fill: red;
}

> .slot-toolbar {
float: right;

Expand Down Expand Up @@ -87,7 +92,7 @@

> span,
> a {
padding: 0 12px;
margin: 0 var(--ti-nav-menu-item-li-margin);
font-size: var(--ti-nav-menu-item-font-size);
text-align: center;
color: var(--ti-nav-menu-item-text-color);
Expand All @@ -103,14 +108,16 @@
color: var(--ti-nav-menu-item-text-color);
background: var(--ti-nav-menu-item-hover-bg-color);
text-decoration: none;
font-weight: var(--ti-nav-menu-item-text-font-weight);
}

&.selected {
position: relative;
font-weight: var(--ti-nav-menu-item-text-font-weight);

&:after {
content: ' ';
width: var(--ti-nav-menu-item-selected-underline-width);
width: 100%;
height: var(--ti-nav-menu-item-selected-underline-height);
background: var(--ti-nav-menu-item-selected-underline-bg-color);
border: 1px solid var(--ti-nav-menu-item-selected-underline-bg-color);
Expand Down Expand Up @@ -188,14 +195,17 @@
justify-content: space-between;
align-items: center;
color: var(--ti-nav-menu-popmenu-more-item-text-color);
cursor: pointer;

.more-icon {
fill: var(--ti-nav-menu-popmenu-more-item-icon-color);
}

&.active,
&:hover {
color: var(--ti-nav-menu-popmenu-more-item-hover-text-color);
background: var(--ti-nav-menu-popmenu-more-item-hover-bg-color);
font-weight: 700;

> a {
color: var(--ti-nav-menu-popmenu-more-item-hover-text-color);
Expand Down Expand Up @@ -268,7 +278,7 @@
list-style: none;

&:first-child {
margin-top: 18px;
margin-top: var(--ti-nav-menu-submenu-group-margin-top);
}

> .@{nav-menu-prefix-cls}__sub-menu-title {
Expand Down Expand Up @@ -303,7 +313,7 @@

.sub-item {
font-size: var(--ti-nav-menu-popmenu-node-item-font-size);
padding: 4px 0;
padding: var(--ti-nav-menu-popmenu-node-item-padding-top) 0 var(--ti-nav-menu-popmenu-node-item-padding-button);

&.third-title {
> a,
Expand Down Expand Up @@ -332,12 +342,27 @@
white-space: normal;
word-break: break-all;
text-decoration: none;
font-size: var(--ti-nav-menu-popmenu-text-font-size);
cursor: pointer;

&.selected {
color: var(--ti-nav-menu-popmenu-selected-text-color);
font-weight: var(--ti-nav-menu-popmenu-selected-font-weight);
position: relative;

&:after {
content: '';
position: absolute;
left: 0;
bottom: 0;
width: 100%;
height: 1px;
background: var(--ti-nav-menu-item-selected-underline-bg-color);
z-index: 1;
}
}
}

&.only-secondary-title {
> span,
> a {
Expand Down Expand Up @@ -396,11 +421,11 @@
> .more-button {
float: left;
text-align: center;
padding: 0 12px;
margin: 0 var(--ti-nav-menu-item-li-margin);
height: var(--ti-nav-menu-height);
line-height: var(--ti-nav-menu-height);
overflow: hidden;
fill: #fff;
fill: var(--ti-nav-menu-item-more-button-fill);
font-size: var(--ti-nav-menu-item-font-size);

&:hover {
Expand Down
29 changes: 28 additions & 1 deletion packages/theme/src/nav-menu/smb-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
export const tinyNavMenuSmbTheme = {
'ti-nav-menu-bg-color': '#282b33'
'ti-nav-menu-bg-color': 'var(--ti-common-color-bg-navigation)',
'ti-nav-menu-item-text-color': 'var(--ti-common-color-text-primary)',
'ti-nav-menu-item-more-button-fill': 'var(--ti-common-color-text-primary)',
'ti-nav-menu-popmenu-more-item-icon-color': 'var(--ti-common-color-icon-normal)',
'ti-nav-menu-popmenu-more-item-hover-text-color': 'var(--ti-common-color-primary-normal)',
'ti-nav-menu-popmenu-text-color': 'var(--ti-common-color-text-secondary)',
'ti-nav-menu-item-hover-bg-color': 'var(--ti-common-color-bg-navigation)',
'ti-nav-menu-item-text-font-weight': 'var(--ti-common-font-weight-bold)',
'ti-nav-menu-popmenu-selected-font-weight': 'var(--ti-common-font-weight-bold)',
'ti-nav-menu-item-selected-underline-height': 'var(--ti-common-border-weight-1)',
'ti-nav-menu-item-selected-underline-bg-color': 'var(--ti-common-color-text-primary)',
'ti-nav-menu-submenu-group-margin-top': 'var(--ti-common-size-9x)',
'ti-nav-menu-padding': 'var(--ti-common-size-4x)',
'ti-nav-menu-item-li-margin': 'var(--ti-common-size-4x)',
'ti-nav-menu-slot-logo-margin-left': 'var(--ti-common-size-4x)',
'ti-nav-menu-slot-logo-margin-right': 'var(--ti-common-size-12x)',
'ti-nav-menu-popmenu-node-item-padding-top': 'var(--ti-common-space-0)',
'ti-nav-menu-popmenu-node-item-padding-button': 'calc(var(--ti-common-space-3x) + 2px)',
'ti-nav-menu-submenu-padding-horizontal': 'calc(var(--ti-common-space-base) * 20.5)',
'ti-nav-menu-popmenu-node-title-margin-bottom': 'calc(var(--ti-common-space-4x) + 2px)',
'ti-nav-menu-popmenu-text-font-size': 'var(--ti-common-font-size-0)',
// SMB未定义颜色
'ti-nav-menu-popmenu-more-item-hover-bg-color': '#F5F5F5',
'ti-nav-menu-popmenu-more-item-active-bg-color': 'var(--ti-common-color-bg-navigation)',
'ti-nav-menu-popmenu-more-item-selected-bg-color': 'var(--ti-common-color-bg-navigation)',
'ti-nav-menu-popmenu-border-color': 'var(--ti-common-color-bg-navigation)',
'ti-nav-menu-popmenu-box-shadow': 'var(--ti-common-shadow-2-down)',
'ti-nav-menu-item-font-size': 'var(--ti-common-font-size-base)'
}
26 changes: 22 additions & 4 deletions packages/theme/src/nav-menu/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,28 @@
--ti-nav-menu-bg-color: var(--ti-common-color-bg-navigation, #282b33);
// 导航菜单栏字号
--ti-nav-menu-item-font-size: var(--ti-common-font-size-2, 16px);
// 单个导航菜单外边距
--ti-nav-menu-item-li-margin: var(--ti-common-size-3x, 12px);
// 自定义图标外左边距
--ti-nav-menu-slot-logo-margin-left: var(--ti-common-space-0, 0);
// 自定义图标外右边距
--ti-nav-menu-slot-logo-margin-right: var(--ti-common-size-25x, 100px);
// 导航菜单栏内边距
--ti-nav-menu-padding: var(--ti-common-size-6x, 24px);
// 导航菜单栏文本色
--ti-nav-menu-item-text-color: var(--ti-common-color-light, #fff);
// 导航菜单栏更多图标
--ti-nav-menu-item-more-button-fill: var(--ti-common-color-light, #fff);
// 导航菜单栏选中后字体大小
--ti-nav-menu-item-text-font-weight: var(--ti-common-font-weight-4, normal);
// 导航菜单栏项悬浮背景色
--ti-nav-menu-item-hover-bg-color: #474c5e;
// 导航菜单栏项选中下划线宽度
--ti-nav-menu-item-selected-underline-width: var(--ti-common-size-14x, 56px);
// 导航菜单栏项选中下划线高度
--ti-nav-menu-item-selected-underline-height: calc(var(--ti-common-size-base, 4px) - 1);
// 导航菜单栏项选中下划线圆角
--ti-nav-menu-item-selected-border-radius: var(--ti-common-border-radius-0, 0px);
--ti-nav-menu-item-selected-border-radius: var(--ti-common-border-radius-0, 0);
// 导航菜单栏项选中下划线固定定位底部距离(hide)
--ti-nav-menu-item-selected-position-bottom: var(--ti-common-space-0, 0px);
--ti-nav-menu-item-selected-position-bottom: var(--ti-common-space-0, 0);
// 导航菜单栏项选中下划线背景色
--ti-nav-menu-item-selected-underline-bg-color: var(--ti-common-color-light, #fff);
// 导航菜单设置图标大小
Expand Down Expand Up @@ -83,6 +93,14 @@
--ti-nav-menu-popmenu-title-border-color-bottom: transparent;
// 导航菜单下拉框标题字号
--ti-nav-menu-popmenu-node-title-font-size: var(--ti-common-font-size-1, 14px);
// 导航菜单下拉框标题字号
--ti-nav-menu-popmenu-text-font-size: var(--ti-common-font-size-1, 14px);
// 导航菜单下拉框非标题项字号
--ti-nav-menu-popmenu-node-item-font-size: var(--ti-common-font-size-base, 12px);
// 导航菜单下拉框外边距
--ti-nav-menu-submenu-group-margin-top: var(--ti-common-space-4x, 18px);
// 导航菜单下拉框外上边距
--ti-nav-menu-popmenu-node-item-padding-top: var(--ti-common-space-base, 4px);
// 导航菜单下拉框外下边距
--ti-nav-menu-popmenu-node-item-padding-button: var(--ti-common-space-base, 4px);
}