[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Vector print logo and print styles on all wikis
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/383491 ) Change subject: Enable Vector print logo and print styles on all wikis .. Enable Vector print logo and print styles on all wikis Bug: T169732 Change-Id: Ia92657dd2937996c62652bc1675dcc8461fcf8fc --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 15 insertions(+), 2 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 9fec548..2f73978 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -650,6 +650,20 @@ wfLoadSkin( 'Timeless' ); // T154371 } +// The Print logo for Vector should use the same wordmark as Minerva +// This avoids duplicate config entries (T169732) +if ( + isset( $wgMinervaCustomLogos['copyright'] ) && + isset( $wgMinervaCustomLogos['copyright-height'] ) && + isset( $wgMinervaCustomLogos['copyright-width'] ) +) { + $wgVectorPrintLogo = [ + 'width' => $wgMinervaCustomLogos['copyright-width'], + 'height' => $wgMinervaCustomLogos['copyright-height'], + 'url' => $wgMinervaCustomLogos['copyright'], + ]; +} + // Grants and rights // Note these have to be visible on all wikis, not just the ones the // extension is enabled on, for proper display in OAuth pages and such. diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index b7a7a49..89315ad 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7178,8 +7178,7 @@ // T169732 'wgVectorExperimentalPrintStyles' => [ - 'default' => false, - 'testwiki' => true, + 'default' => true, ], 'wgVectorResponsive' => [ -- To view, visit https://gerrit.wikimedia.org/r/383491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia92657dd2937996c62652bc1675dcc8461fcf8fc Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Vector print logo and print styles on all wikis
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/383491 ) Change subject: Enable Vector print logo and print styles on all wikis .. Enable Vector print logo and print styles on all wikis Bug: T169732 Change-Id: Ia92657dd2937996c62652bc1675dcc8461fcf8fc --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/91/383491/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index d53b1de..8c7ceea 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -650,6 +650,20 @@ wfLoadSkin( 'Timeless' ); // T154371 } +// The Print logo for Vector should use the same wordmark as Minerva +// This avoids duplicate config entries (T169732) +if ( + isset( $wgMinervaCustomLogos['copyright'] ) && + isset( $wgMinervaCustomLogos['copyright-height'] ) && + isset( $wgMinervaCustomLogos['copyright-width'] ) +) { + $wgVectorPrintLogo = [ + 'width' => $wgMinervaCustomLogos['copyright-width'], + 'height' => $wgMinervaCustomLogos['copyright-height'], + 'url' => $wgMinervaCustomLogos['copyright'], + ]; +} + // Grants and rights // Note these have to be visible on all wikis, not just the ones the // extension is enabled on, for proper display in OAuth pages and such. diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index b8e7692..7d10369 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7178,8 +7178,7 @@ // T169732 'wgVectorExperimentalPrintStyles' => [ - 'default' => false, - 'testwiki' => true, + 'default' => true, ], 'wgVectorResponsive' => [ -- To view, visit https://gerrit.wikimedia.org/r/383491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia92657dd2937996c62652bc1675dcc8461fcf8fc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits