Smuggli has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166420

Change subject: Added support for MW 1.24
......................................................................

Added support for MW 1.24

 - Removed unnecessary import statement which led to an error
 - Added fallback support for MW 1.22

Change-Id: Ia47ebc8adbaeeb9f31f158a4626fe1d2a4905081
---
M BlueSpiceSkin.php
M resources/screen.layout.less
2 files changed, 13 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/20/166420/1

diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index d5a3d43..385efbc 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -66,18 +66,24 @@
 
 $wgResourceModules['skins.bluespiceskin'] = array(
        'styles' => array(
-               'common/commonElements.css' => array('media' => 'screen'),
-               'common/commonContent.css' => array('media' => 'screen'),
-               'common/commonInterface.css' => array('media' => 'screen'),
-               'common/commonPrint.css' => array( 'media' => 'print' ),
-
                'BlueSpiceSkin/resources/screen.less',
                'BlueSpiceSkin/resources/print.less' => array('media' => 
'print'),
                'BlueSpiceSkin/resources/bs.icons.css',
                'BlueSpiceSkin/resources/fonts.css'
-
+       ),
+       'dependencies' => array(
+               'mediawiki.skinning.interface'
        )
-)+$aResourceModuleTemplate;
+) + $aResourceModuleTemplate;
+
+if ( version_compare( $GLOBALS['wgVersion'], '1.23', '<' ) ) {
+       $wgResourceModules['skins.bluespiceskin']['styles'] += array(
+               'common/commonElements.css' => array('media' => 'screen'),
+               'common/commonContent.css' => array('media' => 'screen'),
+               'common/commonInterface.css' => array('media' => 'screen'),
+               'common/commonPrint.css' => array( 'media' => 'print' ),
+       );
+}
 
 unset($aResourceModuleTemplate);
 
diff --git a/resources/screen.layout.less b/resources/screen.layout.less
index 57f4f6b..2032029 100644
--- a/resources/screen.layout.less
+++ b/resources/screen.layout.less
@@ -1,5 +1,3 @@
-@import "bluespiceskin.variables.less";
-
 body.mediawiki {
        /*@embed*/
        background:url(images/desktop/bg-lo.png) no-repeat center top #F4F4F4;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia47ebc8adbaeeb9f31f158a4626fe1d2a4905081
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Smuggli <mug...@hallowelt.biz>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to