Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 8a2633d

Browse files
committed
fixup! Implement CardUi4
1 parent 3002884 commit 8a2633d

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

‎src/components/ui4/CardUi4.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const CardUi4 = (props: Props) => {
5858
style={styles.cardContainer}
5959
>
6060
<>
61-
{icon && <View style={styles.iconContainer}>{icon}</View>}
61+
{icon ==null ? null : <View style={styles.iconContainer}>{icon}</View>}
6262
<SectionView>{children}</SectionView>
6363
</>
6464
</TouchableHighlight>
@@ -70,7 +70,7 @@ export const CardUi4 = (props: Props) => {
7070
const getStyles = cacheStyles((theme: Theme) => ({
7171
cardContainer: {
7272
backgroundColor: theme.cardBackgroundUi4,
73-
borderRadius: theme.rem(theme.cardRadiusUi4),
73+
borderRadius: theme.rem(theme.cardRadiusRemUi4),
7474
margin: theme.rem(0.5),
7575
padding: theme.rem(0.5),
7676
flexDirection: 'row'

‎src/theme/variables/edgeDark.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ export const edgeDark: Theme = {
398398

399399
// UI 4.0:
400400
cardBackgroundUi4: palette.teal,
401-
cardRadiusUi4: 1,
401+
cardRadiusRemUi4: 1,
402402

403403
touchHighlightUi4: palette.lightGrayOp75
404404
}

‎src/theme/variables/edgeLight.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ export const edgeLight: Theme = {
395395

396396
// UI 4.0:
397397
cardBackgroundUi4: palette.mutedGray,
398-
cardRadiusUi4: 1,
398+
cardRadiusRemUi4: 1,
399399

400400
touchHighlightUi4: palette.lightGrayOp75
401401
}

‎src/theme/variables/testDark.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ export const testDark: Theme = {
415415

416416
// UI 4.0:
417417
cardBackgroundUi4: palette.teal,
418-
cardRadiusUi4: 1,
418+
cardRadiusRemUi4: 1,
419419

420420
touchHighlightUi4: palette.lightGrayOp75
421421
}

‎src/types/Theme.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ export interface Theme {
395395

396396
// UI 4.0:
397397
cardBackgroundUi4: string
398-
cardRadiusUi4: number
398+
cardRadiusRemUi4: number
399399

400400
touchHighlightUi4: string
401401
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /