EditPage: Remove temporary OOUI page class name

Follow-up to I2b468c8b84, broken out for simplicity.

Change-Id: I16578dafafbcf7dfbbbb909ceb89cd64d5b40a82

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 0e1438f..72a072d 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2658,8 +2658,7 @@ class EditPage {
                $wgOut->addHTML( Html::openElement(
                        'form',
                        [
-                               // Keep mw-editform-ooui class for backwards-compatibility temporarily
-                               'class' => 'mw-editform mw-editform-ooui',
+                               'class' => 'mw-editform',
                                'id' => self::EDITFORM_ID,
                                'name' => self::EDITFORM_ID,
                                'method' => 'post',

diff --git a/resources/Resources.php b/resources/Resources.php
index 4a7f3e4..004c13b 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1428,7 +1428,7 @@ return [
        ],
        'mediawiki.action.edit.styles' => [
                'targets' => [ 'desktop', 'mobile' ],
-               'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.css',
+               'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.less',
        ],
        'mediawiki.action.edit.collapsibleFooter' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
deleted file mode 100644 (file)
index 7b6aaa8..0000000
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
- * Styles for elements of the editing form.
- */
-
-/* General layout */
-#wpTextbox1 {
-       margin: 0;
-       display: block;
-       /* Ensure the textarea is not higher than browser's viewport on small screens */
-       max-height: 100vh;
-       /* But don't let it collapse into nothingness on really tiny screens */
-       min-height: 5em;
-}
-
-/*
- * Add a bit of margin space between the preview and the toolbar.
- * This replaces the ugly <p><br /></p> we used to insert into the page source
- */
-#wikiPreview.ontop {
-       margin-bottom: 1em;
-}
-
-/* Adjustments to edit form elements */
-#editpage-copywarn {
-       font-size: 0.9em;
-}
-
-.mw-editform-ooui #wpSummaryWidget {
-       display: block;
-       margin-bottom: 1em;
-       max-width: none;
-}
-
-.mw-editform-ooui #editpage-copywarn {
-       line-height: 1.26;
-}
-
-.mw-editform-ooui #wpSummaryLabel {
-       margin: 0;
-}
-
-.mw-editform-ooui .editCheckboxes .oo-ui-fieldLayout {
-       margin-right: 1em;
-}
-
-.mw-editform-ooui .editHelp {
-       margin-left: 0.5em;
-       vertical-align: middle;
-}
-
-.mw-editform-ooui .editHelp a {
-       font-weight: bold;
-}
-
-.mw-editform-ooui .editOptions {
-       border-radius: 0 0 2px 2px;
-}

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
new file mode 100644 (file)
index 0000000..dc6a366
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
@@ -0,0 +1,56 @@
+/*!
+ * Styles for elements of the editing form.
+ */
+
+/*
+ * Add a bit of margin space between the preview and the toolbar.
+ * This replaces the ugly <p><br /></p> we used to insert into the page source
+ */
+#wikiPreview.ontop {
+       margin-bottom: 1em;
+}
+
+.mw-editform {
+       /* General layout */
+       #wpTextbox1 {
+               margin: 0;
+               display: block;
+               /* Ensure the textarea is not higher than browser's viewport on small screens */
+               max-height: 100vh;
+               /* But don't let it collapse into nothingness on really tiny screens */
+               min-height: 5em;
+       }
+
+       /* Adjustments to edit form elements */
+       #editpage-copywarn {
+               font-size: 0.9em;
+               line-height: 1.26;
+       }
+
+       #wpSummaryWidget {
+               display: block;
+               margin-bottom: 1em;
+               max-width: none;
+       }
+
+       #wpSummaryLabel {
+               margin: 0;
+       }
+
+       .editCheckboxes .oo-ui-fieldLayout {
+               margin-right: 1em;
+       }
+
+       .editHelp {
+               margin-left: 0.5em;
+               vertical-align: middle;
+
+               a {
+                       font-weight: bold;
+               }
+       }
+
+       .editOptions {
+               border-radius: 0 0 2px 2px;
+       }
+}