jenkins-bot has submitted this change and it was merged. Change subject: Final design tweaks to footer ......................................................................
Final design tweaks to footer * Add a padding bottom to footer per Nirzar (totals 15px at bottom now) * Update icon with new icon from Nirzar that will not get squashed * Font size should only apply to license and hlist not related pages Bug: T141002 Change-Id: I2c54bafcc5ad78c5c464a4204d0eff65f785a54c --- M includes/skins/footer.mustache M includes/skins/minerva.mustache M resources/skins.minerva.footerV2.styles/common.less M resources/skins.minerva.icons.images.variants/clock.svg 4 files changed, 9 insertions(+), 4 deletions(-) Approvals: Jhobs: Looks good to me, but someone else must approve Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/skins/footer.mustache b/includes/skins/footer.mustache index d5b1ea8..7fe9418 100644 --- a/includes/skins/footer.mustache +++ b/includes/skins/footer.mustache @@ -3,7 +3,7 @@ {{{lastmodified}}} <div class="post-content footer-content"> <h2>{{{headinghtml}}}</h2> - <div>{{{licensehtml}}}</div> + <div class="license">{{{licensehtml}}}</div> {{#lists}} <ul class="footer-{{name}} hlist hlist-separated"> {{! "." means "current context", which allows us to iterate over Plain Old PHP Arrays™. }} diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache index 0796387..d7cf5b9 100644 --- a/includes/skins/minerva.mustache +++ b/includes/skins/minerva.mustache @@ -1,4 +1,4 @@ -<!-- v:4 --> +<!-- v:5 --> {{{headelement}}} <div id="mw-mf-viewport"> {{>ie8Html5Support}} diff --git a/resources/skins.minerva.footerV2.styles/common.less b/resources/skins.minerva.footerV2.styles/common.less index 98c96a5..7297b86 100644 --- a/resources/skins.minerva.footerV2.styles/common.less +++ b/resources/skins.minerva.footerV2.styles/common.less @@ -12,6 +12,7 @@ .feature-footer-v2 footer { overflow: auto; + padding-bottom: 6px; // FIXME: Move to skins.minerva.content.styles/lists.less when pushing to stable .hlist-separated { @@ -63,7 +64,6 @@ margin-top: 42px; > * { - font-size: 0.875em; margin-bottom: 9px; } @@ -78,6 +78,11 @@ margin-top: 0; } } + + .hlist, + .license { + font-size: 0.875em; + } } } diff --git a/resources/skins.minerva.icons.images.variants/clock.svg b/resources/skins.minerva.icons.images.variants/clock.svg index bcc8a36..4a540b5 100644 --- a/resources/skins.minerva.icons.images.variants/clock.svg +++ b/resources/skins.minerva.icons.images.variants/clock.svg @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg width="19" height="17" viewBox="0 0 19 17" xmlns="http://www.w3.org/2000/svg"><title>60D09D03-11C8-45CE-89FD-0CDCF810A626</title><g id="Page-1"><g id="footer-recently-edited"><g id="Group-2"><path d="M10.853 0a8.137 8.137 0 0 0-8.14 8.143H0l3.524 3.524.063.13 3.65-3.654H4.525a6.334 6.334 0 0 1 12.666 0 6.334 6.334 0 0 1-6.333 6.333c-1.75 0-3.33-.715-4.474-1.86l-1.28 1.28a8.09 8.09 0 0 0 5.75 2.39c4.5 0 8.147-3.646 8.147-8.143A8.144 8.144 0 0 0 10.853 0zm-.9 4.524v4.524l3.872 2.298.65-1.1L11.31 8.37V4.523H9.952z" id="Page-1"/></g></g></g></svg> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg width="20" height="17" viewBox="0 0 20 17" xmlns="http://www.w3.org/2000/svg"><title>Page 1</title><g id="Page-1"><g id="footer---old-edited"><g id="Group-2"><path d="M11.424 0C6.686 0 2.857 3.806 2.857 8.5H0l3.71 3.68.066.136L7.62 8.5H4.76c0-3.65 2.986-6.61 6.667-6.61 3.68 0 6.665 2.96 6.665 6.61 0 3.65-2.985 6.61-6.666 6.61a6.668 6.668 0 0 1-4.71-1.94l-1.35 1.337A8.553 8.553 0 0 0 11.425 17C16.162 17 20 13.194 20 8.5S16.162 0 11.424 0zm-1.037 5v4.524l3.904 2.298.658-1.1-3.193-1.877V5h-1.368z" id="Page-1"/></g></g></g></svg> \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/306732 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2c54bafcc5ad78c5c464a4204d0eff65f785a54c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org> Gerrit-Reviewer: Jhobs <jhob...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits