Merge pull request #530 from wordpress-mobile/try/improve-372

Remap font names for iOS for PR 372.
wordpress-mobile · Feb 1, 2019 · 3d7ecf0 · 3d7ecf0
2 parents 27b4de6 + 0ae4ca8
commit 3d7ecf0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/gutenberg b/gutenberg
diff --git a/sass-transformer.js b/sass-transformer.js
@@ -64,6 +64,7 @@ if ( reactNativeMinorVersion >= 56 ) {
 // TODO: need to find a way to pass the include paths and the default asset files via some config
 const autoImportIncludePaths = [
 	path.join( path.dirname( __filename ), 'gutenberg/assets/stylesheets' ),
+	path.join( path.dirname( __filename ), 'src' ),
 ];
 const autoImportAssets = [
 	'_colors.scss',

diff --git a/src/block-management/block-holder.scss b/src/block-management/block-holder.scss
@@ -70,7 +70,7 @@
 	padding-top: 24;
 	padding-bottom: 24;
 	font-size: 16px;
-	font-family: serif;
+	font-family: $default-regular-font;
 }
 
 .aztec_container {

diff --git a/src/variables.android.scss b/src/variables.android.scss
@@ -2,3 +2,4 @@
 
 // Fonts
 $default-monospace-font: monospace;
+$default-regular-font: serif;
diff --git a/src/variables.ios.scss b/src/variables.ios.scss
@@ -2,3 +2,4 @@
 
 // Fonts
 $default-monospace-font: courier;
+$default-regular-font: 'NotoSerif';