Always load styles for Special:Block page

Load the styles regardless of whether the user has
JavaScript.

Bug: T212880
Change-Id: If103aebd1ca1368ddee7322bf52f7d9d35bd950c

diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index c9ce2b0..6a21e85 100644 (file)
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -394,7 +394,10 @@ class SpecialBlock extends FormSpecialPage {
         * @return string
         */
        protected function preText() {
-               $this->getOutput()->addModuleStyles( 'mediawiki.widgets.TagMultiselectWidget.styles' );
+               $this->getOutput()->addModuleStyles( [
+                       'mediawiki.widgets.TagMultiselectWidget.styles',
+                       'mediawiki.special',
+               ] );
                $this->getOutput()->addModules( [ 'mediawiki.special.block' ] );
 
                $blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' );

diff --git a/resources/Resources.php b/resources/Resources.php
index c8daad6..767f6de 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1987,6 +1987,7 @@ return [
                        'resources/src/mediawiki.special/upload.css',
                        'resources/src/mediawiki.special/userrights.css',
                        'resources/src/mediawiki.special/watchlist.css',
+                       'resources/src/mediawiki.special/block.less'
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -2065,7 +2066,6 @@ return [
        ],
        'mediawiki.special.block' => [
                'scripts' => 'resources/src/mediawiki.special.block.js',
-               'styles' => 'resources/src/mediawiki.special.block.less',
                'dependencies' => [
                        'oojs-ui-core',
                        'oojs-ui.styles.icons-editing-core',

diff --git a/resources/src/mediawiki.special.block.less b/resources/src/mediawiki.special.block.less
deleted file mode 100644 (file)
index 1748635..0000000
--- a/resources/src/mediawiki.special.block.less
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Special:Block styles */
-
-// OOUIHTMLForm styles
-@ooui-font-size-browser: 16; // Assumed browser default of `16px`
-@ooui-font-size-base: 0.875em; // Equals `14px` at browser default of `16px`
-
-@ooui-spacing-radio-label: 26 / @ooui-font-size-browser / @ooui-font-size-base; // Equals `1.85714286em`≈`26px`
-
-.mw-block-page-restrictions.oo-ui-fieldLayout {
-       margin-top: 0;
-       margin-left: @ooui-spacing-radio-label;
-
-       .oo-ui-widget {
-               // Support:; IE 8 and browsers which don't support `calc()`
-               max-width: 48em;
-               // Support: IE 9+ and all modern browsers;
-               max-width: calc( 50em - @ooui-spacing-radio-label );
-       }
-}

diff --git a/resources/src/mediawiki.special/block.less b/resources/src/mediawiki.special/block.less
new file mode 100644 (file)
index 0000000..1748635
--- /dev/null
+++ b/resources/src/mediawiki.special/block.less
@@ -0,0 +1,19 @@
+/* Special:Block styles */
+
+// OOUIHTMLForm styles
+@ooui-font-size-browser: 16; // Assumed browser default of `16px`
+@ooui-font-size-base: 0.875em; // Equals `14px` at browser default of `16px`
+
+@ooui-spacing-radio-label: 26 / @ooui-font-size-browser / @ooui-font-size-base; // Equals `1.85714286em`≈`26px`
+
+.mw-block-page-restrictions.oo-ui-fieldLayout {
+       margin-top: 0;
+       margin-left: @ooui-spacing-radio-label;
+
+       .oo-ui-widget {
+               // Support:; IE 8 and browsers which don't support `calc()`
+               max-width: 48em;
+               // Support: IE 9+ and all modern browsers;
+               max-width: calc( 50em - @ooui-spacing-radio-label );
+       }
+}