From 6d56bb8afdc0a8a3e28a4b578672f6a63018eeb1 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 8 Apr 2020 01:38:39 +0100 Subject: [PATCH] Revert "Mobile: Fixes #2847: Fixed text issue in config screen on some devices (#2851)" Reverted to fix regression (crash) in iOS app. https://github.com/laurent22/joplin/pull/2851#issuecomment-610688103 This reverts commit e024015d5e4056c54d2c7eadda961004716c801e. --- ReactNativeClient/lib/components/global-style.js | 1 - ReactNativeClient/lib/components/screens/config.js | 1 - 2 files changed, 2 deletions(-) diff --git a/ReactNativeClient/lib/components/global-style.js b/ReactNativeClient/lib/components/global-style.js index b810b8925c..4790db1ae5 100644 --- a/ReactNativeClient/lib/components/global-style.js +++ b/ReactNativeClient/lib/components/global-style.js @@ -89,7 +89,6 @@ function addExtraStyles(style) { color: style.color, fontSize: style.fontSize * 1.2, fontWeight: 'bold', - fontFamily: 'Roboto', }; style.headerWrapperStyle = { diff --git a/ReactNativeClient/lib/components/screens/config.js b/ReactNativeClient/lib/components/screens/config.js index 02351540a2..df4a861bb1 100644 --- a/ReactNativeClient/lib/components/screens/config.js +++ b/ReactNativeClient/lib/components/screens/config.js @@ -242,7 +242,6 @@ class ConfigScreenComponent extends BaseScreenComponent { styles.linkText.borderBottomColor = theme.color; styles.linkText.flex = 0; styles.linkText.fontWeight = 'normal'; - styles.linkText.fontFamily = 'Roboto'; styles.headerWrapperStyle = Object.assign({}, styles.settingContainer, theme.headerWrapperStyle);