Skip to content

Commit

Permalink
fix: fix fall-menu and page theme vars
Browse files Browse the repository at this point in the history
  • Loading branch information
@zzcr
zzcr committed Oct 15, 2024
1 parent 7955198 commit e2a5fba
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 49 deletions.
46 changes: 23 additions & 23 deletions packages/theme/src/fall-menu/index.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
@fall-menu-prefix-cls: ~'@{css-prefix}fall-menu';

.@{fall-menu-prefix-cls} {
.component-css-vars-fall-menu();
.inject-FallMenu-vars();
box-shadow: 0 1px 4px 0 #14000000;

& &__wrap {
background: var(--tv-Fall-menu-bg-color-normal);
background: var(--tv-FallMenu-bg-color-normal);
padding: 0 24px;
}

& &__nav {
height: var(--tv-Fall-menu-menu-height);
height: var(--tv-FallMenu-menu-height);
margin: 0 auto;
position: relative;
}
Expand All @@ -36,16 +36,16 @@

.icon-slot-left,
.icon-slot-right {
color: var(--tv-Fall-menu-slot-text-color);
color: var(--tv-FallMenu-slot-text-color);
cursor: pointer;
position: absolute;
top: 50%;
transform: translateY(-50%);
font-size: var(--tv-Fall-menu-icon-font-size);
font-size: var(--tv-FallMenu-icon-font-size);
line-height: 1;

svg {
fill: var(--tv-Fall-menu-box-svg-fill);
fill: var(--tv-FallMenu-box-svg-fill);
}
}

Expand All @@ -69,8 +69,8 @@
}

.active-show {
font-size: var(--tv-Fall-menu-box-font-size-hover);
font-weight: var(--tv-Fall-menu-box-font-weight-hover);
font-size: var(--tv-FallMenu-box-font-size-hover);
font-weight: var(--tv-FallMenu-box-font-weight-hover);
}

ul {
Expand All @@ -90,20 +90,20 @@
display: block;
width: auto;
padding: 0 12px;
height: var(--tv-Fall-menu-menu-height);
height: var(--tv-FallMenu-menu-height);
text-align: center;
text-decoration: none;
font-weight: 400;
line-height: var(--tv-Fall-menu-menu-height);
font-size: var(--tv-Fall-menu-title-font-size);
color: var(--tv-Fall-menu-slot-text-color);
line-height: var(--tv-FallMenu-menu-height);
font-size: var(--tv-FallMenu-title-font-size);
color: var(--tv-FallMenu-slot-text-color);

&:hover,
&.now {
color: var(--tv-Fall-menu-slot-text-color);
color: var(--tv-FallMenu-slot-text-color);
text-decoration: none;
font-size: var(--tv-Fall-menu-box-font-size-hover);
font-weight: var(--tv-Fall-menu-box-font-weight-hover);
font-size: var(--tv-FallMenu-box-font-size-hover);
font-weight: var(--tv-FallMenu-box-font-weight-hover);
}

&.now:before {
Expand All @@ -123,12 +123,12 @@
& &__box {
position: absolute;
left: 0px;
top: var(--tv-Fall-menu-menu-height);
top: var(--tv-FallMenu-menu-height);
width: 100%;
background: var(--tv-Fall-menu-slot-bg-color);
background: var(--tv-FallMenu-slot-bg-color);
overflow: hidden;
transition: opacity 0.4s;
border-radius: var(--tv-Fall-menu-box-border-radius);
border-radius: var(--tv-FallMenu-box-border-radius);
.opacity(0);

.contbox {
Expand All @@ -147,9 +147,9 @@
width: 100%;

h3.mcate-item-hd {
font-size: var(--tv-Fall-menu-box-font-size);
font-size: var(--tv-FallMenu-box-font-size);
border-bottom: 0 solid #ccc;
color: var(--tv-Fall-menu-box-title-text-color);
color: var(--tv-FallMenu-box-title-text-color);
font-weight: 700;
margin: 0;
line-height: 32px;
Expand All @@ -160,8 +160,8 @@
line-height: 32px;

a {
font-size: var(--tv-Fall-menu-box-a-font-size);
color: var(--tv-Fall-menu-box-text-color);
font-size: var(--tv-FallMenu-box-a-font-size);
color: var(--tv-FallMenu-box-text-color);
text-decoration: none;
display: block;
overflow: hidden;
Expand All @@ -171,7 +171,7 @@

&:hover {
text-decoration: underline;
color: var(--tv-Fall-menu-box-hover-text-color);
color: var(--tv-FallMenu-box-hover-text-color);
}
}
}
Expand Down
40 changes: 20 additions & 20 deletions packages/theme/src/fall-menu/vars.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,43 @@
*
*/

.component-css-vars-fall-menu() {
.inject-FallMenu-vars() {
// 菜单列表高度
--tv-Fall-menu-menu-height: var(--tv-size-height-xl);
--tv-FallMenu-menu-height: var(--tv-size-height-xl);
// 菜单背景色
--tv-Fall-menu-bg-color-normal: var(--tv-color-bg-secondary);
--tv-FallMenu-bg-color-normal: var(--tv-color-bg-secondary);
// 菜单项悬浮背景色
--tv-Fall-menu-bg-color-hover: var(--tv-color-bg-hover);
--tv-FallMenu-bg-color-hover: var(--tv-color-bg-hover);
// 左右图标大小
--tv-Fall-menu-icon-font-size: var(--tv-font-size-md);
--tv-FallMenu-icon-font-size: var(--tv-font-size-md);
// 菜单项文本色
--tv-Fall-menu-slot-text-color: var(--tv-color-text);
--tv-FallMenu-slot-text-color: var(--tv-color-text);
// 悬浮下拉框背景色
--tv-Fall-menu-slot-bg-color: var(--tv-color-bg-secondary);
--tv-FallMenu-slot-bg-color: var(--tv-color-bg-secondary);
// 菜单项字号
--tv-Fall-menu-title-font-size: var(--tv-font-size-lg);
--tv-FallMenu-title-font-size: var(--tv-font-size-lg);
// 下拉框标题文本色
--tv-Fall-menu-box-title-text-color: var(--tv-color-text);
--tv-FallMenu-box-title-text-color: var(--tv-color-text);
// 下拉框文本色
--tv-Fall-menu-box-text-color: var(--tv-color-text-secondary);
--tv-FallMenu-box-text-color: var(--tv-color-text-secondary);
// 下拉框标题字号
--tv-Fall-menu-box-font-size: var(--tv-font-size-md);
--tv-FallMenu-box-font-size: var(--tv-font-size-md);
// 下拉框标题高度
--tv-Fall-menu-box-title-height: var(--tv-size-height-xs);
--tv-FallMenu-box-title-height: var(--tv-size-height-xs);
// 下拉框内容高度
--tv-Fall-menu-box-content-height: var(--tv-size-height-sm);
--tv-FallMenu-box-content-height: var(--tv-size-height-sm);
// 下拉框悬浮文本色
--tv-Fall-menu-box-hover-text-color: var(--tv-color-act-primary-text-hover);
--tv-FallMenu-box-hover-text-color: var(--tv-color-act-primary-text-hover);
// 标签下边框颜色值
--tv-Fall-menu-li-color-hover: var(--tv-color-act-primary-text-hover);
--tv-FallMenu-li-color-hover: var(--tv-color-act-primary-text-hover);
// 下拉框菜单文本字体大小
--tv-Fall-menu-box-a-font-size: var(--tv-font-size-sm);
--tv-FallMenu-box-a-font-size: var(--tv-font-size-sm);
// 当前菜单悬浮字体
--tv-Fall-menu-box-font-size-hover: var(--tv-font-size-heading-xs);
--tv-FallMenu-box-font-size-hover: var(--tv-font-size-heading-xs);
// 当前菜单悬浮权重
--tv-Fall-menu-box-font-weight-hover: var(--tv-font-weight-bold);
--tv-FallMenu-box-font-weight-hover: var(--tv-font-weight-bold);
// 图标填充颜色
--tv-Fall-menu-box-svg-fill: var(--tv-color-icon);
--tv-FallMenu-box-svg-fill: var(--tv-color-icon);
// 菜单列表圆角
--tv-Fall-menu-box-border-radius: var(--tv-border-radius-md);
--tv-FallMenu-box-border-radius: var(--tv-border-radius-md);
}
2 changes: 1 addition & 1 deletion packages/theme/src/grid/table.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@

&.col__right {
.@{grid-cell-prefix-cls} {
justify-content: end;
justify-content: flex-end;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/theme/src/pager/index.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@select-svg-cls: ~'@{css-prefix}svg';

.@{pager-prefix-cls} {
.component-css-vars-pager();
.inject-Pager-vars();

text-align: left;
padding: var(--tv-Pager-padding-y) 0;
Expand Down Expand Up @@ -251,7 +251,7 @@
}

&__selector {
.component-css-vars-pager();
.inject-Pager-vars();

&.@{popover-prefix-cls}.@{popper-prefix-cls} {
border: 0;
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/pager/vars.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
*/

.component-css-vars-pager() {
.inject-Pager-vars() {
// 分页字号
--tv-Pager-font-size: var(--tv-font-size-md);
// 分页文本色
Expand Down
5 changes: 3 additions & 2 deletions packages/theme/src/time-range/index.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
&__cell {
box-sizing: border-box;
margin: 0;
padding: var(--ti-time-range-picker-cell-padding-top) var(--ti-time-range-picker-cell-padding-right) var(--ti-time-range-picker-cell-padding-bottom);
padding: var(--ti-time-range-picker-cell-padding-top) var(--ti-time-range-picker-cell-padding-right)
var(--ti-time-range-picker-cell-padding-bottom);
width: 50%;
}

Expand Down Expand Up @@ -78,7 +79,7 @@
box-sizing: border-box;
margin-top: 12px;
display: flex;
justify-content: end;
justify-content: flex-end;
align-items: center;
}

Expand Down

0 comments on commit e2a5fba

Please sign in to comment.