diff --git a/dev-scripts/setup-storybook.sh b/dev-scripts/setup-storybook.sh
index 79979bd..542301b 100755
--- a/dev-scripts/setup-storybook.sh
+++ b/dev-scripts/setup-storybook.sh
@@ -3,9 +3,14 @@ set -euo pipefail
IFS=$'\n\t'
mkdir -p .storybook/resolve-less-imports/mediawiki.ui
+mkdir -p docs/ui/assets/
curl "https://en.wikipedia.org/w/load.php?only=styles&skin=vector&debug=true&modules=ext.echo.styles.badge|ext.uls.pt|wikibase.client.init|mediawiki.skinning.interface" -o .storybook/integration.less
curl -L "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/master/resources/src/mediawiki.less/mediawiki.mixins.less?format=TEXT" | base64 --decode > .storybook/resolve-less-imports/mediawiki.mixins.less
curl -L "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/master/resources/src/mediawiki.less/mediawiki.ui/variables.less?format=TEXT" | base64 --decode > .storybook/resolve-less-imports/mediawiki.ui/variables.less
curl -L "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/master/resources/src/mediawiki.less/mediawiki.mixins.rotation.less?format=TEXT" | base64 --decode > .storybook/resolve-less-imports/mediawiki.mixins.rotation.less
-curl -L "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/master/resources/src/mediawiki.less/mediawiki.mixins.animation.less?format=TEXT" | base64 --decode > .storybook/resolve-less-imports/mediawiki.mixins.animation.less
\ No newline at end of file
+curl -L "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/master/resources/src/mediawiki.less/mediawiki.mixins.animation.less?format=TEXT" | base64 --decode > .storybook/resolve-less-imports/mediawiki.mixins.animation.less
+curl "https://en.m.wikipedia.org/static/images/mobile/copyright/wikipedia-wordmark-en.svg" -o "docs/ui/assets/wordmark.svg"
+curl "https://en.m.wikipedia.org/static/images/mobile/copyright/wikipedia.png" -o "docs/ui/assets/icon.png"
+# FIXME: Update to en.wikipedia.org uris when available.
+curl "https://di-logo-sandbox.firebaseapp.com/img/tagline/en-tagline-117-13.svg" -o "docs/ui/assets/tagline.svg"
diff --git a/includes/VectorTemplate.php b/includes/VectorTemplate.php
index f7ac9ff..f956f2c 100644
--- a/includes/VectorTemplate.php
+++ b/includes/VectorTemplate.php
@@ -144,6 +144,7 @@ class VectorTemplate extends BaseTemplate {
// It should be followed by the name of the hook in hyphenated lowercase.
//
// Conditionally used values must use null to indicate absence (not false or '').
+ $mainPageHref = Skin::makeMainPageUrl();
$commonSkinData = [
'html-headelement' => $this->get( 'headelement', '' ),
'html-sitenotice' => $this->get( 'sitenotice', null ),
@@ -189,6 +190,13 @@ class VectorTemplate extends BaseTemplate {
],
'html-navigation-heading' => $this->getMsg( 'navigation-heading' ),
'data-search-box' => $this->buildSearchProps(),
+
+ // Header
+ 'data-logos' => ResourceLoaderSkinModule::getAvailableLogos( $this->config ),
+ 'msg-sitetitle' => $this->getMsg( 'sitetitle' )->text(),
+ 'msg-sitesubtitle' => $this->getMsg( 'sitesubtitle' )->text(),
+ 'main-page-href' => $mainPageHref,
+
'data-sidebar' => $this->buildSidebar(),
] + $this->getMenuProps();
@@ -320,7 +328,7 @@ class VectorTemplate extends BaseTemplate {
}
return [
- 'has-logo' => true,
+ 'has-logo' => $this->isLegacy,
'html-logo-attributes' => Xml::expandAttributes(
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) + [
'class' => 'mw-wiki-logo',
diff --git a/includes/templates/Logo.mustache b/includes/templates/Logo.mustache
new file mode 100644
index 0000000..c7dc224
--- /dev/null
+++ b/includes/templates/Logo.mustache
@@ -0,0 +1,28 @@
+{{!
+ LogoDefinition logo
+ string main-page-href link to the main page
+ string msg-sitesubtitle the contents of the sitesubtitle message key
+}}
+{{#data-logos}}
+
+ {{#icon}}
+ {{! alt is provided for valid HTML but given aria-hidden not needed. }}
+
+ {{/icon}}
+
+ {{#wordmark}}
+
+ {{/wordmark}}
+ {{^wordmark}}
+ {{msg-sitetitle}}
+ {{/wordmark}}
+ {{#tagline}}
+
+ {{/tagline}}
+
+
+{{/data-logos}}
diff --git a/includes/templates/index.mustache b/includes/templates/index.mustache
index 5b14941..86c2e0a 100644
--- a/includes/templates/index.mustache
+++ b/includes/templates/index.mustache
@@ -22,6 +22,7 @@
string html-dataAfterContent
string html-navigation-heading heading for entire navigation that is usually hidden to screen
readers
+ LogoOptions data-logos
MenuDefinition data-personal-menu See PersonalMenu.mustache for documentation.
object data-namespace-tabs. See VectorTabs.mustache for documentation.
object data-variants. See VectorMenu.mustache for documentation.
@@ -70,6 +71,7 @@
{{{html-dataAfterContent}}}