From 3a9da4b22cfb74a26faab89496416ff48c36b16a Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 1 Feb 2019 00:02:32 -0300 Subject: [PATCH 1/9] Sets the font family for the unsupported block to NotoSerif. --- src/block-management/block-holder.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/block-management/block-holder.scss b/src/block-management/block-holder.scss index e1178c8e3c..aa2ac4f0e6 100644 --- 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: 'NotoSerif'; } .aztec_container { From 93c2c0f0969cc0425b57f8dc8ef345f8c6149790 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 1 Feb 2019 00:17:33 -0300 Subject: [PATCH 2/9] Updates the gutenberg submodule. --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 624b4733ef..4cadca8114 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 624b4733ef7e411caced39c8bb9d1236567542e5 +Subproject commit 4cadca8114fc45c0af2477af64178b42ef50324c From b3932f507353f0b471bea4dfccbf468c78b41c16 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 1 Feb 2019 11:24:32 -0300 Subject: [PATCH 3/9] Updates the gutenberg reference and adds some default font configurations. --- gutenberg | 2 +- src/variables.android.scss | 1 + src/variables.ios.scss | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 4cadca8114..91530bc0d6 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 4cadca8114fc45c0af2477af64178b42ef50324c +Subproject commit 91530bc0d62bc801650f4c3e14a1521044632339 diff --git a/src/variables.android.scss b/src/variables.android.scss index 5e3b748a6f..3b90fe2781 100644 --- 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 index 6c0e52ba1e..50dd0a9857 100644 --- a/src/variables.ios.scss +++ b/src/variables.ios.scss @@ -2,3 +2,4 @@ // Fonts $default-monospace-font: courier; +$default-regular-font: 'NotoSerif'; From e93ae7f24ccfcdc11c887d78cc4cac92ecfeb188 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 1 Feb 2019 11:29:02 -0300 Subject: [PATCH 4/9] Modifies the default font within the block holder. --- src/block-management/block-holder.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/block-management/block-holder.scss b/src/block-management/block-holder.scss index aa2ac4f0e6..5dd7646924 100644 --- 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: 'NotoSerif'; + font-family: $default-regular-font; } .aztec_container { From ac0bd749707997c4fbdfce170e71e60b7f9b2d07 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 1 Feb 2019 12:10:33 -0300 Subject: [PATCH 5/9] Adds some rules so we can import variable.scss files from the gutenberg repo. --- gutenberg | 2 +- sass-transformer.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 91530bc0d6..aede794db3 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 91530bc0d62bc801650f4c3e14a1521044632339 +Subproject commit aede794db39cc562ebb459d2eafa80fb26ff6b89 diff --git a/sass-transformer.js b/sass-transformer.js index 58b8b25e84..d0659b846b 100644 --- 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', From 766ec461ad260cea0d8f634003611ad41e40f3a0 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 1 Feb 2019 12:53:36 -0300 Subject: [PATCH 6/9] Updates the gutenberg reference. --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index aede794db3..dfd03a5bfb 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit aede794db39cc562ebb459d2eafa80fb26ff6b89 +Subproject commit dfd03a5bfb20b3fa8b14acdecc5132f2d6f2e4e8 From dbf5621cabfe6c0a0f23edc2a1bd6e4e2ef77540 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 1 Feb 2019 12:55:37 -0300 Subject: [PATCH 7/9] Updates the gutenberg submodule. --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index dfd03a5bfb..da950fc85b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit dfd03a5bfb20b3fa8b14acdecc5132f2d6f2e4e8 +Subproject commit da950fc85b9531f8b971d0249bdd5a2f6dbcdb1d From ad36a075b2793c7e5e2a188e8b6625e1e2728845 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 1 Feb 2019 13:02:29 -0300 Subject: [PATCH 8/9] Updates the gutenberg submodule reference. --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index da950fc85b..69b8fd7df1 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit da950fc85b9531f8b971d0249bdd5a2f6dbcdb1d +Subproject commit 69b8fd7df145a1a24db4597331cd13d94be6ae43 From 0652cbb0693b808991cdc365bf7f66e58c747a08 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 1 Feb 2019 14:40:03 -0300 Subject: [PATCH 9/9] Updates the Gutenberg submodule. --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 69b8fd7df1..8b52a1aad4 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 69b8fd7df145a1a24db4597331cd13d94be6ae43 +Subproject commit 8b52a1aad49b780f4bea2ea5f9bf448b4bc982c1