diff --git a/src/collections/human.js b/src/collections/human.js index 5ddab4c..98aa27f 100644 --- a/src/collections/human.js +++ b/src/collections/human.js @@ -17,77 +17,77 @@ const getStylesForColor = color => ({ fontSize: 34, lineHeight: 41, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(34), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(34) : undefined, color: colors[color], }, title1: { fontSize: 28, lineHeight: 34, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(28), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(28) : undefined, color: colors[color], }, title2: { fontSize: 22, lineHeight: 28, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(22), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(22) : undefined, color: colors[color], }, title3: { fontSize: 20, lineHeight: 25, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(20), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(20) : undefined, color: colors[color], }, headline: { fontSize: 17, lineHeight: 22, ...systemWeights.semibold, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(17), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(17) : undefined, color: colors[color], }, body: { fontSize: 17, lineHeight: 22, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(17), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(17) : undefined, color: colors[color], }, callout: { fontSize: 16, lineHeight: 21, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(16), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(16) : undefined, color: colors[color], }, subhead: { fontSize: 15, lineHeight: 20, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(15), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(15) : undefined, color: colors[color], }, footnote: { fontSize: 13, lineHeight: 18, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(13), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(13) : undefined, color: colors[color], }, caption1: { fontSize: 12, lineHeight: 16, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(12), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(12) : undefined, color: colors[color], }, caption2: { fontSize: 11, lineHeight: 13, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(11), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(11) : undefined, color: colors[color], }, }); diff --git a/src/collections/iOSUIKit.js b/src/collections/iOSUIKit.js index 4d59b12..e83f676 100644 --- a/src/collections/iOSUIKit.js +++ b/src/collections/iOSUIKit.js @@ -14,19 +14,19 @@ const getStylesForColor = color => { largeTitleEmphasized: { ...human[`largeTitle${colorSuffix}Object`], ...systemWeights.bold, - letterSpacing: Platform.OS === 'ios' && 0.41, + letterSpacing: Platform.OS === 'ios' ? 0.41 : undefined, }, title3: human[`title3${colorSuffix}Object`], title3Emphasized: { ...human[`title3${colorSuffix}Object`], ...systemWeights.semibold, - letterSpacing: Platform.OS === 'ios' && 0.75, + letterSpacing: Platform.OS === 'ios' ? 0.75 : undefined, }, body: human[`body${colorSuffix}Object`], bodyEmphasized: { ...human[`body${colorSuffix}Object`], ...systemWeights.semibold, - letterSpacing: Platform.OS === 'ios' && -0.41, + letterSpacing: Platform.OS === 'ios' ? -0.41 : undefined, }, subhead: human[`subhead${colorSuffix}Object`], subheadShort: { @@ -36,20 +36,20 @@ const getStylesForColor = color => { subheadEmphasized: { ...human[`subhead${colorSuffix}Object`], ...systemWeights.semibold, - letterSpacing: Platform.OS === 'ios' && -0.24, + letterSpacing: Platform.OS === 'ios' ? -0.24 : undefined, }, callout: human[`callout${colorSuffix}Object`], footnote: human[`footnote${colorSuffix}Object`], footnoteEmphasized: { ...human[`footnote${colorSuffix}Object`], ...systemWeights.semibold, - letterSpacing: Platform.OS === 'ios' && -0.08, + letterSpacing: Platform.OS === 'ios' ? -0.08 : undefined, }, caption2: human[`caption2${colorSuffix}Object`], caption2Emphasized: { ...human[`caption2${colorSuffix}Object`], ...systemWeights.semibold, - letterSpacing: Platform.OS === 'ios' && 0.06, + letterSpacing: Platform.OS === 'ios' ? 0.06 : undefined, }, }; }; diff --git a/src/collections/material.js b/src/collections/material.js index f72b672..e9cbb5d 100644 --- a/src/collections/material.js +++ b/src/collections/material.js @@ -25,77 +25,77 @@ const getStylesForColor = color => ({ fontSize: 112, lineHeight: 128, ...systemWeights.light, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(112), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(112) : undefined, color: colors[color].secondary, }, display3: { fontSize: 56, lineHeight: 64, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(56), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(56) : undefined, color: colors[color].secondary, }, display2: { fontSize: 45, lineHeight: 64, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(45), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(45) : undefined, color: colors[color].secondary, }, display1: { fontSize: 34, lineHeight: 52, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(34), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(34) : undefined, color: colors[color].secondary, }, headline: { fontSize: 24, lineHeight: 32, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(24), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(24) : undefined, color: colors[color].primary, }, title: { fontSize: 20, lineHeight: 28, ...systemWeights.semibold, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(20), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(20) : undefined, color: colors[color].primary, }, subheading: { fontSize: 16, lineHeight: 24, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(16), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(16) : undefined, color: colors[color].primary, }, body2: { fontSize: 14, lineHeight: 24, ...systemWeights.semibold, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(14), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(14) : undefined, color: colors[color].primary, }, body1: { fontSize: 14, lineHeight: 20, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(14), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(14) : undefined, color: colors[color].primary, }, caption: { fontSize: 12, lineHeight: 16, ...systemWeights.regular, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(12), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(12) : undefined, color: colors[color].secondary, }, button: { fontSize: 14, lineHeight: 16, ...systemWeights.semibold, - letterSpacing: Platform.OS === 'ios' && sanFranciscoSpacing(14), + letterSpacing: Platform.OS === 'ios' ? sanFranciscoSpacing(14) : undefined, color: colors[color].primary, }, });