From 3da079ec6fe8a1f2112e69295ba893afbf9c8f1e Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Fri, 25 Aug 2017 18:35:53 +0100
Subject: [PATCH] Remove 'Browser default' editfont option

Bug: T170223
Change-Id: I1ace59c980740fc785ccbd500e19cc8b71d46a5b
---
 includes/EditPage.php                     | 1 -
 includes/Preferences.php                  | 1 -
 languages/i18n/en.json                    | 1 -
 languages/i18n/qqq.json                   | 1 -
 resources/src/mediawiki.legacy/shared.css | 6 ------
 5 files changed, 10 deletions(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 0e1438f8f7..023934cc90 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -4655,7 +4655,6 @@ class EditPage {
 			];
 
 		// The following classes can be used here:
-		// * mw-editfont-default
 		// * mw-editfont-monospace
 		// * mw-editfont-sans-serif
 		// * mw-editfont-serif
diff --git a/includes/Preferences.php b/includes/Preferences.php
index c64e8a8ae1..8ed5a6d538 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -835,7 +835,6 @@ class Preferences {
 					$context->msg( 'editfont-monospace' )->text() => 'monospace',
 					$context->msg( 'editfont-sansserif' )->text() => 'sans-serif',
 					$context->msg( 'editfont-serif' )->text() => 'serif',
-					$context->msg( 'editfont-default' )->text() => 'default',
 				]
 			];
 		}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a44b3cfd6a..18df54ab09 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -51,7 +51,6 @@
 	"underline-never": "Never",
 	"underline-default": "Skin or browser default",
 	"editfont-style": "Edit area font style:",
-	"editfont-default": "Browser default",
 	"editfont-monospace": "Monospaced font",
 	"editfont-sansserif": "Sans-serif font",
 	"editfont-serif": "Serif font",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 036a941011..aeb676676c 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -241,7 +241,6 @@
 	"underline-never": "Used in [[Special:Preferences#mw-prefsection-rendering|Preferences]].\n\nThis option means \"never underline links\", there are also options {{msg-mw|Underline-always}} and {{msg-mw|Underline-default}}.\n\n{{Gender}}\n{{Identical|Never}}",
 	"underline-default": "Used in [[Special:Preferences#mw-prefsection-rendering|Preferences]].\n\nThis option means \"underline links as in your user skin or your browser\", there are also options {{msg-mw|Underline-never}} and {{msg-mw|Underline-always}}.\n\n{{Gender}}\n{{Identical|Browser default}}",
 	"editfont-style": "Used in [[Special:Preferences]], tab Editing. {{Gender}}",
-	"editfont-default": "Option used in [[Special:Preferences]], tab Editing. {{Gender}}\n{{Identical|Browser default}}",
 	"editfont-monospace": "Option used in [[Special:Preferences]], tab Editing. {{Gender}}",
 	"editfont-sansserif": "Option used in [[Special:Preferences]], tab Editing. {{Gender}}",
 	"editfont-serif": "Option used in [[Special:Preferences]], tab Editing. {{Gender}}",
diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index bace9d0262..26897b89a8 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -111,12 +111,6 @@ span.comment {
 }
 
 /* Edit font preference */
-/* TODO: for 'default' on non-textareas we could compute the default font of textarea in the client */
-.mw-editfont-default:not( textarea ) {
-	font-family: monospace;
-}
-
-/* Keep this rule separate from the :not rule above so it still works in older browsers */
 .mw-editfont-monospace {
 	font-family: monospace;
 }
-- 
2.20.1