jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346925 )
Change subject: Add HD logos
......................................................................
Add HD logos
Bug: T100999
Change-Id: Idb8559a178f339c1eb6aa520f2d7d0a8ac2c003e
(cherry picked from commit 60c3c69d51deb6395621ceac0588a51f277e6eb5)
---
M LocalSettings.php
A puppet/modules/mediawiki/files/mediawiki-vagrant-1.5x.png
A puppet/modules/mediawiki/files/mediawiki-vagrant-2x.png
M puppet/modules/mediawiki/manifests/init.pp
4 files changed, 13 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/LocalSettings.php b/LocalSettings.php
index c927378..85c32f2 100644
--- a/LocalSettings.php
+++ b/LocalSettings.php
@@ -51,6 +51,11 @@
// Images
$wgLogo = '/mediawiki-vagrant.png';
+$wgLogoHD = [
+ '1.5x' => '/mediawiki-vagrant-1.5x.png',
+ '2x' => '/mediawiki-vagrant-2x.png'
+];
+
$wgUseInstantCommons = true;
$wgEnableUploads = true;
diff --git a/puppet/modules/mediawiki/files/mediawiki-vagrant-1.5x.png
b/puppet/modules/mediawiki/files/mediawiki-vagrant-1.5x.png
new file mode 100644
index 0000000..5941782
--- /dev/null
+++ b/puppet/modules/mediawiki/files/mediawiki-vagrant-1.5x.png
Binary files differ
diff --git a/puppet/modules/mediawiki/files/mediawiki-vagrant-2x.png
b/puppet/modules/mediawiki/files/mediawiki-vagrant-2x.png
new file mode 100644
index 0000000..a0316fd
--- /dev/null
+++ b/puppet/modules/mediawiki/files/mediawiki-vagrant-2x.png
Binary files differ
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index de21365..19c9218 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -170,6 +170,14 @@
source => 'puppet:///modules/mediawiki/mediawiki-vagrant.png',
}
+ file { "${mediawiki::apache::docroot}/mediawiki-vagrant-1.5x.png":
+ source => 'puppet:///modules/mediawiki/mediawiki-vagrant-1.5x.png',
+ }
+
+ file { "${mediawiki::apache::docroot}/mediawiki-vagrant-2x.png":
+ source => 'puppet:///modules/mediawiki/mediawiki-vagrant-2x.png',
+ }
+
file { '/usr/local/bin/run-mediawiki-tests':
source => 'puppet:///modules/mediawiki/run-mediawiki-tests',
mode => '0755',
--
To view, visit https://gerrit.wikimedia.org/r/346925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb8559a178f339c1eb6aa520f2d7d0a8ac2c003e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: trusty-compat
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
