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.

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

Fix styles for wallet money badge which is not center vertically #27137

Merged
merged 9 commits into from
Sep 18, 2023
Merged

Fix styles for wallet money badge which is not center vertically #27137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d9260f4
Fix styles for wallet money badge which is not center vertically
ZhenjaHorbach Sep 11, 2023
72ade3d
Update styles for safari
ZhenjaHorbach Sep 11, 2023
7908688
Refactor styles
ZhenjaHorbach Sep 13, 2023
d755595
Revert changes
ZhenjaHorbach Sep 13, 2023
28ace49
Merge branch 'main' into fix/money-text-in-wallet-badge-is-not-center…
ZhenjaHorbach Sep 14, 2023
b662396
Fix conflicts
ZhenjaHorbach Sep 14, 2023
a524c89
Add comment
ZhenjaHorbach Sep 18, 2023
5305a7b
Make changes only for Safari
ZhenjaHorbach Sep 18, 2023
8f6dd92
Make changes only for Safari x2
ZhenjaHorbach Sep 18, 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
4 changes: 3 additions & 1 deletion src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import Colors from './colors';

// touchCallout is an iOS safari only property that controls the display of the callout information when you touch and hold a target
const touchCalloutNone = Browser.isMobileSafari() ? {WebkitTouchCallout: 'none'} : {};
// to prevent vertical text offset in Safari for badges, new lineHeight values have been added
const lineHeightBadge = Browser.isSafari() ? {lineHeight: variables.lineHeightXSmall} : {lineHeight: variables.lineHeightNormal};

const picker = (theme) => ({
backgroundColor: theme.transparent,
Expand Down Expand Up @@ -759,7 +761,7 @@ const styles = (theme) => ({
badgeText: {
color: theme.text,
fontSize: variables.fontSizeSmall,
lineHeight: variables.lineHeightNormal,
...lineHeightBadge,
...whiteSpace.noWrap,
},

Expand Down
1 change: 1 addition & 0 deletions src/styles/variables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export default {
optionRowHeightCompact: 52,
optionsListSectionHeaderHeight: getValueUsingPixelRatio(32, 38),
overlayOpacity: 0.6,
lineHeightXSmall: getValueUsingPixelRatio(11, 17),
lineHeightSmall: getValueUsingPixelRatio(14, 16),
lineHeightNormal: getValueUsingPixelRatio(16, 21),
lineHeightLarge: getValueUsingPixelRatio(18, 24),
Expand Down
Loading