jenkins-bot has submitted this change and it was merged.
Change subject: Add logo image to banner
......................................................................
Add logo image to banner
Includes a backwards compatibility module that doesn't seem to work?
Change-Id: Id79688a4eb4bf7f813e0c5af1d89556c488b0bde
---
M GreyStuff.skin.php
M GreyStuffTemplate.php
M resources/main.less
M skin.json
4 files changed, 26 insertions(+), 0 deletions(-)
Approvals:
Isarra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GreyStuff.skin.php b/GreyStuff.skin.php
index 6a62b7d..095073b 100755
--- a/GreyStuff.skin.php
+++ b/GreyStuff.skin.php
@@ -27,6 +27,8 @@
* @param $out OutputPage
*/
function setupSkinUserCss( OutputPage $out ) {
+ global $wgVersion;
+
parent::setupSkinUserCss( $out );
# Add css
@@ -34,5 +36,10 @@
'mediawiki.skinning.content.externallinks',
'skins.greystuff'
) );
+ if ( $out->getResourceLoader()->isModuleRegistered(
'mediawiki.skining.logo' ) ) {
+ $out->addModuleStyles( 'mediawiki.skinning.logo' );
+ } else {
+ $out->addModuleStyles( 'skins.greystuff.logo' );
+ }
}
}
diff --git a/GreyStuffTemplate.php b/GreyStuffTemplate.php
index 115e6ab..c9e81ce 100755
--- a/GreyStuffTemplate.php
+++ b/GreyStuffTemplate.php
@@ -43,6 +43,13 @@
<div id="header-container"<?php $this->html(
'userlangattributes' ); ?>>
<div id="header-top-container">
<div id="header-top">
+ <div id="p-logo" role="banner">
+ <a class="mw-wiki-logo" href="<?php
+ echo htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] )
+ ?>" <?php
+ echo Xml::expandAttributes(
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
+ ?>></a>
+ </div>
<div class="mw-portlet" id="p-banner">
<div id="sitetitle" role="banner">
<a href="<?php echo
htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>">
diff --git a/resources/main.less b/resources/main.less
index b70b735..d0cd55d 100755
--- a/resources/main.less
+++ b/resources/main.less
@@ -78,6 +78,14 @@
}
/* Banner stuff */
+ .mw-wiki-logo {
+ display: block;
+ width: 66px;
+ height: 66px;
+ float: left;
+ background-size: contain;
+ margin-right: 1em;
+ }
#p-banner {
float: left;
diff --git a/skin.json b/skin.json
index 5b89841..153760e 100755
--- a/skin.json
+++ b/skin.json
@@ -40,6 +40,10 @@
},
"scripts": "",
"position": "top"
+ },
+ "skins.greystuff.logo": {
+ "class": "ResourceLoaderSkinModule",
+ "position": "top"
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id79688a4eb4bf7f813e0c5af1d89556c488b0bde
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/skins/GreyStuff
Gerrit-Branch: master
Gerrit-Owner: Isarra <zhoris...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Isarra <zhoris...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
