Skip to content

Commit

Permalink
Merge pull request #50324 from ShridharGoel/patch-20
Browse files Browse the repository at this point in the history
Use small icon in tabs
  • Loading branch information
jasperhuangg authored Nov 8, 2024
2 parents b26f96b + b9bf021 commit 1fc5ae3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/components/Button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ function Button(
<View style={[isContentCentered ? styles.justifyContentCenter : styles.justifyContentBetween, styles.flexRow]}>
<View style={[styles.alignItemsCenter, styles.flexRow, styles.flexShrink1]}>
{!!icon && (
<View style={[large ? styles.mr2 : styles.mr1, !text && styles.mr0, iconStyles]}>
<View style={[styles.mr2, !text && styles.mr0, iconStyles]}>
<Icon
src={icon}
fill={isHovered ? iconHoverFill ?? defaultFill : iconFill ?? defaultFill}
Expand Down
2 changes: 2 additions & 0 deletions src/components/TabSelector/TabIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ function TabIcon({icon, activeOpacity = 0, inactiveOpacity = 1}: TabIconProps) {
<Icon
src={icon}
fill={theme.icon}
small
/>
</Animated.View>
<Animated.View style={[StyleSheet.absoluteFill, {opacity: activeOpacity}]}>
<Icon
src={icon}
fill={theme.iconMenu}
small
/>
</Animated.View>
</>
Expand Down
4 changes: 2 additions & 2 deletions src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4336,8 +4336,8 @@ const styles = (theme: ThemeColors) =>
marginLeft: 8,
...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
color: isSelected ? theme.text : theme.textSupporting,
lineHeight: variables.lineHeightNormal,
fontSize: variables.fontSizeNormal,
lineHeight: variables.lineHeightLarge,
fontSize: variables.fontSizeLabel,
} satisfies TextStyle),

tabBackground: (hovered: boolean, isFocused: boolean, background: string | Animated.AnimatedInterpolation<string>) => ({
Expand Down
2 changes: 1 addition & 1 deletion src/styles/variables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export default {
signInLogoWidthLargeScreen: 144,
signInLogoHeightLargeScreen: 108,
signInLogoWidthPill: 132,
tabSelectorButtonHeight: 42,
tabSelectorButtonHeight: 40,
tabSelectorButtonPadding: 12,
lhnLogoWidth: 95.09,
lhnLogoHeight: 22.33,
Expand Down

0 comments on commit 1fc5ae3

Please sign in to comment.