Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/215007
Change subject: 'new' wmf/1.26wmf8 build with backports ...................................................................... 'new' wmf/1.26wmf8 build with backports * css compatibility fixes for Wikibase + wmf/1.26wmf8 core Change-Id: I5e1f457c084168ea8b1d07c4957c519ae49d94ff --- M composer.lock M extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php M extensions/Wikibase/view/resources/jquery/wikibase/resources.php M extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css M extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php M vendor/composer/installed.json 6 files changed, 30 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/07/215007/1 diff --git a/composer.lock b/composer.lock index ab003e1..24a7f3e 100644 --- a/composer.lock +++ b/composer.lock @@ -1213,12 +1213,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "c6cbbc82609018ebc01ba016fb47c030db736ff4" + "reference": "58da4aea73fed0e982212b9132f72c650bb16376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c6cbbc82609018ebc01ba016fb47c030db736ff4", - "reference": "c6cbbc82609018ebc01ba016fb47c030db736ff4", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/58da4aea73fed0e982212b9132f72c650bb16376", + "reference": "58da4aea73fed0e982212b9132f72c650bb16376", "shasum": "" }, "require": { @@ -1286,7 +1286,7 @@ "wikibaserepo", "wikidata" ], - "time": "2015-05-22 00:01:41" + "time": "2015-06-01 10:48:57" }, { "name": "wikibase/wikimedia-badges", @@ -1298,7 +1298,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wmde/WikimediaBadges/zipball/8dfea8bb0afa937cdca0e33c24115d83f9b417cf", + "url": "https://api.github.com/repos/wmde/WikimediaBadges/zipball/5cb28488f7791302cf6b835610f132b0b05915cf", "reference": "a4cb3fa96adee3f634999873c8bfe432783bf47e", "shasum": "" }, diff --git a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php index 84efaa8..5b5c378 100644 --- a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php +++ b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php @@ -383,9 +383,9 @@ // make css available for JavaScript-less browsers $parserOutput->addModuleStyles( array( 'wikibase.common', - 'jquery.ui.core', - 'jquery.wikibase.statementview', - 'jquery.wikibase.toolbar', + 'jquery.ui.core.styles', + 'jquery.wikibase.statementview.RankSelector.styles', + 'jquery.wikibase.toolbar.styles', ) ); // make sure required client-side resources will be loaded diff --git a/extensions/Wikibase/view/resources/jquery/wikibase/resources.php b/extensions/Wikibase/view/resources/jquery/wikibase/resources.php index 4b39988..d49bb6e 100644 --- a/extensions/Wikibase/view/resources/jquery/wikibase/resources.php +++ b/extensions/Wikibase/view/resources/jquery/wikibase/resources.php @@ -431,13 +431,9 @@ ), 'jquery.wikibase.statementview' => $moduleTemplate + array( - 'position' => 'top', 'scripts' => array( 'jquery.wikibase.statementview.js', 'jquery.wikibase.statementview.RankSelector.js', - ), - 'styles' => array( - 'themes/default/jquery.wikibase.statementview.RankSelector.css', ), 'dependencies' => array( 'jquery.ui.EditableTemplatedWidget', @@ -449,6 +445,7 @@ 'jquery.wikibase.referenceview', 'jquery.wikibase.snakview', 'jquery.wikibase.snaklistview', + 'jquery.wikibase.statementview.RankSelector.styles', 'wikibase.datamodel.Claim', 'wikibase.datamodel.ReferenceList', 'wikibase.datamodel.SnakList', @@ -466,6 +463,13 @@ ), ), + 'jquery.wikibase.statementview.RankSelector.styles' => $moduleTemplate + array( + 'position' => 'top', + 'styles' => array( + 'themes/default/jquery.wikibase.statementview.RankSelector.css', + ), + ), + ); return array_merge( diff --git a/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css b/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css index 7fc0adf..4ecffa8 100644 --- a/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css +++ b/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css @@ -8,7 +8,7 @@ cursor: default; } -.wikibase-rankselector .ui-icon { +.wikibase-rankselector .ui-icon.ui-icon-rankselector { /* @embed */ background-image: url(images/rankselector.png); width: 6px; height: 20px; diff --git a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php index 2dce035..53f415c 100644 --- a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php +++ b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php @@ -91,15 +91,19 @@ ), 'jquery.wikibase.toolbar' => $moduleTemplate + array( - 'position' => 'top', 'scripts' => array( 'jquery.wikibase.toolbar.js', ), - 'styles' => array( - 'themes/default/jquery.wikibase.toolbar.css', - ), 'dependencies' => array( 'jquery.wikibase.toolbaritem', + 'jquery.wikibase.toolbar.styles', + ), + ), + + 'jquery.wikibase.toolbar.styles' => $moduleTemplate + array( + 'position' => 'top', + 'styles' => array( + 'themes/default/jquery.wikibase.toolbar.css', ), ), diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 2ee02f7..35e8e90 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -154,7 +154,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wmde/WikimediaBadges/zipball/8dfea8bb0afa937cdca0e33c24115d83f9b417cf", + "url": "https://api.github.com/repos/wmde/WikimediaBadges/zipball/5cb28488f7791302cf6b835610f132b0b05915cf", "reference": "a4cb3fa96adee3f634999873c8bfe432783bf47e", "shasum": "" }, @@ -1303,12 +1303,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "c6cbbc82609018ebc01ba016fb47c030db736ff4" + "reference": "58da4aea73fed0e982212b9132f72c650bb16376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c6cbbc82609018ebc01ba016fb47c030db736ff4", - "reference": "c6cbbc82609018ebc01ba016fb47c030db736ff4", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/58da4aea73fed0e982212b9132f72c650bb16376", + "reference": "58da4aea73fed0e982212b9132f72c650bb16376", "shasum": "" }, "require": { @@ -1335,7 +1335,7 @@ "conflict": { "mediawiki/mediawiki": "<1.23" }, - "time": "2015-05-22 00:01:41", + "time": "2015-06-01 10:48:57", "type": "mediawiki-extension", "installation-source": "dist", "autoload": { -- To view, visit https://gerrit.wikimedia.org/r/215007 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e1f457c084168ea8b1d07c4957c519ae49d94ff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: wmf/1.26wmf8 Gerrit-Owner: Aude <aude.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits