Skip to content

Commit

Permalink
Merge pull request #421 from Alphatrionty/master
Browse files Browse the repository at this point in the history
fix: 修复tag组件和list组件样式
  • Loading branch information
Tyh2001 committed Aug 4, 2023
2 parents 375670c + 7d7b6c6 commit a55ed2e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
33 changes: 18 additions & 15 deletions packages/fighting-theme/config/var-list.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
.f-list__large {
--list-item-height: 40px;
--list-item-font-size: 16px;
}
.f-list {
// 不同尺寸
&__large {
--list-item-height: 40px;
--list-item-font-size: 16px;
}

.f-list__middle {
--list-item-height: 35px;
--list-item-font-size: 15px;
}
&__middle {
--list-item-height: 35px;
--list-item-font-size: 15px;
}

.f-list__small {
--list-item-height: 30px;
--list-item-font-size: 14px;
}
&__small {
--list-item-height: 30px;
--list-item-font-size: 14px;
}

.f-list__mini {
--list-item-height: 25px;
--list-item-font-size: 13px;
&__mini {
--list-item-height: 25px;
--list-item-font-size: 13px;
}
}
2 changes: 1 addition & 1 deletion packages/fighting-theme/config/var-tag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
--tag-background: none;
}

&__warning.f-tag__line {
&__info.f-tag__line {
--tag-color: #1d1d1f;
--tag-background: none;
}
Expand Down
1 change: 0 additions & 1 deletion packages/fighting-theme/src/list-item.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.f-list-item {
font-size: 14px;
padding: 7px 16px;
box-sizing: border-box;
display: flex;
Expand Down

0 comments on commit a55ed2e

Please sign in to comment.