Merge "Remove 'Browser default' editfont option"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f49157f..3fc12ce 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -4664,7 +4664,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 a7e6684..55ac81e 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -847,7 +847,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 5a3f27b..282b906 100644 (file)
--- 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 a199aa6..4d6cf93 100644 (file)
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -244,7 +244,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 9930525..74233d6 100644 (file)
--- 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;
 }