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.

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(tabbar): fix icon color #1816

Merged
merged 32 commits into from
Dec 28, 2023
Merged
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
49a6aca
feat: uploader taro h5 支持video
xiaoyatong Nov 9, 2023
8297caf
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 13, 2023
9d730d4
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 14, 2023
ecc10ce
fix: delete sth doesnot merge
xiaoyatong Nov 14, 2023
c4a95d7
Merge branch 'next' of https://github.com/xiaoyatong/nutui-react into…
xiaoyatong Dec 4, 2023
bfcac57
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 4, 2023
d4e5820
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 4, 2023
1a8bc4c
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 4, 2023
d7d244b
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 4, 2023
5ee572e
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 4, 2023
d08b5a3
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 4, 2023
444346e
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 4, 2023
6f6c66d
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 5, 2023
8b43d3a
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 5, 2023
c87d30c
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 5, 2023
176700b
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 5, 2023
7e635fb
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 5, 2023
e801c2b
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 5, 2023
bd75947
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 5, 2023
24b8414
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 6, 2023
d350666
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 7, 2023
9503a0e
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 8, 2023
9f0ad94
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 11, 2023
62045d4
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 12, 2023
2c7fe40
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 13, 2023
75a0065
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 15, 2023
a12f9f1
fix(cascader): 第二列数据无法展示问题修复
xiaoyatong Dec 15, 2023
84a6f8e
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 21, 2023
8f38296
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 22, 2023
622ac02
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Dec 24, 2023
8cf465f
fix(tabbar): fix icon color
xiaoyatong Dec 25, 2023
a2d8111
fix: 文本和icon的颜色改为 inherit
oasis-cloud Dec 28, 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
14 changes: 10 additions & 4 deletions src/packages/tabbaritem/tabbaritem.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
color: $tabbar-inactive-color;
height: 100%;

&-active {
color: $tabbar-active-color;
}

&-icon-box {
padding: 0px;
display: flex;
Expand All @@ -41,4 +37,14 @@
font-weight: $tabbar-text-large-font-weight;
}
}

&-active {
color: $tabbar-active-color;
.nut-tabbar-item-icon-box {
color: inherit;
.nut-icon {
color: inherit;
}
}
}
}
Loading