From b831ba8d771978cf7a6313a6ad3e192912a56533 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Tue, 24 Oct 2017 16:29:26 +0100
Subject: [PATCH] Move edit font styles to separate module

This allows pages that don't load mediawiki.legacy.shared
(e.g. MobileFrontend) to still have access to edit fonts.

Change-Id: Ifff40f756558e30f6551f29a945a31f0eef4cfed
---
 includes/EditPage.php                          |  1 +
 resources/Resources.php                        |  5 +++++
 resources/src/mediawiki.legacy/shared.css      | 13 -------------
 resources/src/mediawiki/mediawiki.editfont.css | 12 ++++++++++++
 4 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 resources/src/mediawiki/mediawiki.editfont.css

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a07a236caf..4260c99324 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2408,6 +2408,7 @@ class EditPage {
 
 		$out->addModules( 'mediawiki.action.edit' );
 		$out->addModuleStyles( 'mediawiki.action.edit.styles' );
+		$out->addModuleStyles( 'mediawiki.editfont.styles' );
 
 		$user = $this->context->getUser();
 		if ( $user->getOption( 'showtoolbar' ) ) {
diff --git a/resources/Resources.php b/resources/Resources.php
index 7d606e7fbc..a0e1863efd 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1388,6 +1388,10 @@ return [
 		'scripts' => 'resources/src/mediawiki/mediawiki.experiments.js',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
+	'mediawiki.editfont.styles' => [
+		'styles' => 'resources/src/mediawiki/mediawiki.editfont.css',
+		'targets' => [ 'desktop', 'mobile' ],
+	],
 
 	/* MediaWiki Action */
 
@@ -1399,6 +1403,7 @@ return [
 		'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
 		'dependencies' => [
 			'mediawiki.action.edit.styles',
+			'mediawiki.editfont.styles',
 			'jquery.textSelection',
 			'oojs-ui-core',
 			'mediawiki.widgets.visibleByteLimit',
diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index ecdfb6161d..9f48204bb6 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -110,19 +110,6 @@ span.comment {
 	height: 22px;
 }
 
-/* Edit font preference */
-.mw-editfont-monospace {
-	font-family: monospace;
-}
-
-.mw-editfont-sans-serif {
-	font-family: sans-serif;
-}
-
-.mw-editfont-serif {
-	font-family: serif;
-}
-
 /* Underline preference */
 
 .mw-underline-always a {
diff --git a/resources/src/mediawiki/mediawiki.editfont.css b/resources/src/mediawiki/mediawiki.editfont.css
new file mode 100644
index 0000000000..6228030dd2
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.editfont.css
@@ -0,0 +1,12 @@
+/* Edit font preference */
+.mw-editfont-monospace {
+	font-family: monospace;
+}
+
+.mw-editfont-sans-serif {
+	font-family: sans-serif;
+}
+
+.mw-editfont-serif {
+	font-family: serif;
+}
-- 
2.20.1