jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/346582 )

Change subject: Allow loading progress bar to appear on skins other than Vector 
and MonoBook
......................................................................


Allow loading progress bar to appear on skins other than Vector and MonoBook

The styles are not specific to the Vector and MonoBook skins, but rather
to the MediaWiki and Apex themes of OOjs UI. Rename them to reflect that.

Change-Id: I757e8d96625feb8290cbf7837b5d801961cda344
---
M extension.json
R modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-apextheme.css
R 
modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-mediawikitheme.css
3 files changed, 8 insertions(+), 5 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/extension.json b/extension.json
index 8fa97dd..f12b8b0 100644
--- a/extension.json
+++ b/extension.json
@@ -271,11 +271,14 @@
                        "scripts": 
"modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js",
                        "styles": 
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css",
                        "skinStyles": {
-                               "vector": [
-                                       
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-vector.css"
+                               "default": [
+                                       
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-mediawikitheme.css"
                                ],
                                "monobook": [
-                                       
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-monobook.css"
+                                       
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-apextheme.css"
+                               ],
+                               "apex": [
+                                       
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-apextheme.css"
                                ]
                        },
                        "dependencies": [
diff --git 
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-monobook.css 
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-apextheme.css
similarity index 92%
rename from 
modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-monobook.css
rename to 
modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-apextheme.css
index b79d77e..78405af 100644
--- 
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-monobook.css
+++ 
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-apextheme.css
@@ -1,5 +1,5 @@
 /*!
- * VisualEditor MediaWiki DesktopArticleTarget Monobook init styles.
+ * VisualEditor MediaWiki DesktopArticleTarget Apex theme init styles.
  *
  * @copyright 2011-2017 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
diff --git 
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-vector.css 
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-mediawikitheme.css
similarity index 83%
rename from 
modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-vector.css
rename to 
modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-mediawikitheme.css
index 65f2ae1..0dbe634 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-vector.css
+++ 
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init-mediawikitheme.css
@@ -1,5 +1,5 @@
 /*!
- * VisualEditor MediaWiki DesktopArticleTarget Vector init styles.
+ * VisualEditor MediaWiki DesktopArticleTarget MediaWiki theme init styles.
  *
  * @copyright 2011-2017 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt

-- 
To view, visit https://gerrit.wikimedia.org/r/346582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I757e8d96625feb8290cbf7837b5d801961cda344
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz DziewoƄski <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to