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 label fonts #14217

Merged
merged 10 commits into from
Jan 13, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/AutoUpdateTime.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class AutoUpdateTime extends PureComponent {
render() {
return (
<View style={[styles.mb6, styles.detailsPageSectionContainer]}>
<Text style={[styles.formLabel, styles.mb2]} numberOfLines={1}>
<Text style={[styles.textLabelSupporting, styles.mb2]} numberOfLines={1}>
{this.props.translate('detailsPage.localTime')}
</Text>
<Text numberOfLines={1}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/IOUConfirmationList.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class IOUConfirmationList extends Component {
}));

sections.push({
title: this.props.translate('common.to').toUpperCase(),
title: this.props.translate('common.to'),
data: formattedParticipants,
shouldShow: true,
indexOffset: 0,
Expand Down
2 changes: 1 addition & 1 deletion src/components/OptionsList/BaseOptionsList.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class BaseOptionsList extends Component {
// we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
// So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
<View style={styles.optionsListSectionHeader}>
<Text style={[styles.p5, styles.textMicroBold, styles.colorHeading, styles.textUppercase]}>
<Text style={[styles.p5, styles.textLabelSupporting]}>
{title}
</Text>
</View>
Expand Down
2 changes: 1 addition & 1 deletion src/components/TestToolMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const defaultProps = {

const TestToolMenu = props => (
<>
<Text style={[styles.formLabel]} numberOfLines={1}>
<Text style={[styles.textLabelSupporting, styles.mb2, styles.mt6]} numberOfLines={1}>
Test Preferences
</Text>

Expand Down
6 changes: 3 additions & 3 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,13 @@ export default {
openLinkInBrowser: 'open this link in your browser',
},
iOUConfirmationList: {
whoPaid: 'WHO PAID?',
whoWasThere: 'WHO WAS THERE?',
whoPaid: 'Who paid?',
whoWasThere: 'Who was there?',
whatsItFor: 'What\'s it for?',
},
iOUCurrencySelection: {
selectCurrency: 'Select a currency',
allCurrencies: 'ALL CURRENCIES',
allCurrencies: 'All currencies',
},
optionsSelector: {
nameEmailOrPhoneNumber: 'Name, email, or phone number',
Expand Down
6 changes: 3 additions & 3 deletions src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,13 @@ export default {
openLinkInBrowser: 'abrir este enlace en tu navegador',
},
iOUConfirmationList: {
whoPaid: '¿QUIÉN PAGO?',
whoWasThere: '¿QUIÉN ASISTIÓ?',
whoPaid: '¿Quién pago?',
whoWasThere: '¿Quién asistió?',
whatsItFor: '¿Para qué es?',
},
iOUCurrencySelection: {
selectCurrency: 'Selecciona una moneda',
allCurrencies: 'TODAS LAS MONEDAS',
allCurrencies: 'Todas las monedas',
},
optionsSelector: {
nameEmailOrPhoneNumber: 'Nombre, email o número de teléfono',
Expand Down
4 changes: 2 additions & 2 deletions src/pages/DetailsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class DetailsPage extends React.PureComponent {
)}
{details.login ? (
<View style={[styles.mb6, styles.detailsPageSectionContainer, styles.w100]}>
<Text style={[styles.formLabel, styles.mb2]} numberOfLines={1}>
<Text style={[styles.textLabelSupporting, styles.mb2]} numberOfLines={1}>
{this.props.translate(isSMSLogin
? 'common.phoneNumber'
: 'common.email')}
Expand All @@ -169,7 +169,7 @@ class DetailsPage extends React.PureComponent {
) : null}
{pronouns ? (
<View style={[styles.mb6, styles.detailsPageSectionContainer]}>
<Text style={[styles.formLabel, styles.mb2]} numberOfLines={1}>
<Text style={[styles.textLabelSupporting, styles.mb2]} numberOfLines={1}>
{this.props.translate('profilePage.preferredPronouns')}
</Text>
<Text numberOfLines={1}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class IOUParticipantsSplit extends Component {
<SafeAreaConsumer>
{({safeAreaPaddingBottomStyle}) => (
<View style={[styles.flex1, styles.w100, (this.props.participants.length > 0 ? safeAreaPaddingBottomStyle : {})]}>
<Text style={[styles.formLabel, styles.pt3, styles.ph5]}>
<Text style={[styles.textLabelSupporting, styles.pt3, styles.ph5]}>
{this.props.translate('common.to')}
</Text>
<OptionsSelector
Expand Down
2 changes: 1 addition & 1 deletion src/pages/settings/PreferencesPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const PreferencesPage = (props) => {
/>
<ScrollView style={styles.flex1} contentContainerStyle={styles.p5}>
<View style={[styles.settingsPageBody, styles.mb6]}>
<Text style={[styles.formLabel]} numberOfLines={1}>
<Text style={[styles.textLabelSupporting, styles.mb2]} numberOfLines={1}>
{props.translate('common.notifications')}
</Text>
<View style={[styles.flexRow, styles.mb6, styles.justifyContentBetween]}>
Expand Down
4 changes: 2 additions & 2 deletions src/stories/Composer.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const Default = (args) => {
]}
nativeID={CONST.REPORT.DROP_NATIVE_ID}
>
<Text style={[styles.mb2, styles.formLabel]}>Entered Comment (Drop Enabled)</Text>
<Text style={[styles.mb2, styles.textLabelSupporting]}>Entered Comment (Drop Enabled)</Text>
<Text>{comment}</Text>
</View>
<View
Expand All @@ -62,7 +62,7 @@ const Default = (args) => {
styles.flex1,
]}
>
<Text style={[styles.mb2, styles.formLabel]}>Rendered Comment</Text>
<Text style={[styles.mb2, styles.textLabelSupporting]}>Rendered Comment</Text>
{Boolean(renderedHTML) && <RenderHTML html={renderedHTML} />}
{pastedFile && (
<View style={styles.mv3}>
Expand Down
9 changes: 0 additions & 9 deletions src/styles/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -894,15 +894,6 @@ const styles = {
lineHeight: 16,
},

formLabel: {
fontFamily: fontFamily.EXP_NEUE_BOLD,
fontWeight: fontWeightBold,
color: themeColors.heading,
fontSize: variables.fontSizeLabel,
lineHeight: variables.lineHeightLarge,
marginBottom: 8,
},

formHelp: {
color: themeColors.textSupporting,
fontSize: variables.fontSizeLabel,
Expand Down