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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a07a236..4260c99 100644 (file)
--- 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 7d606e7..a0e1863 100644 (file)
--- 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 ecdfb61..9f48204 100644 (file)
--- 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 (file)
index 0000000..6228030
--- /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;
+}