[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Rework Template:Multiple_image hack
jenkins-bot has submitted this change and it was merged. Change subject: Rework Template:Multiple_image hack .. Rework Template:Multiple_image hack - Move it into the hacks file where it belongs. - Only apply when under tablet-width - Add comment referring to tickets for future reference - Use display box to - align center - wrap sibling images to the next line if needed - make sure a thumbcaption child is always on it's own line Bug: T148505 Change-Id: Ib6c1a4af34157384aded880c13078a647e342588 --- M resources/skins.minerva.content.styles/hacks.less M resources/skins.minerva.content.styles/thumbnails.less 2 files changed, 12 insertions(+), 6 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/skins.minerva.content.styles/hacks.less b/resources/skins.minerva.content.styles/hacks.less index 41950cc..f426485 100644 --- a/resources/skins.minerva.content.styles/hacks.less +++ b/resources/skins.minerva.content.styles/hacks.less @@ -132,5 +132,17 @@ } } } + // Deal with Template:Multiple_image. T38030 and T148505 + .thumb .thumbinner { + > div { + .flex-display( flex ); + justify-content: center; + flex-wrap: wrap; + align-content: flex-start; + } + > .thumbcaption { + .flex( 1, 0, 100% ); + } + } } } diff --git a/resources/skins.minerva.content.styles/thumbnails.less b/resources/skins.minerva.content.styles/thumbnails.less index 25a7507..8da82bd 100644 --- a/resources/skins.minerva.content.styles/thumbnails.less +++ b/resources/skins.minerva.content.styles/thumbnails.less @@ -21,12 +21,6 @@ margin: 0 auto; // !important is needed because of Bug T87198 for example max-width: 100% !important; - - > div { - float: none !important; - width: auto !important; - clear: both !important; - } } /* bug 20030 */ -- To view, visit https://gerrit.wikimedia.org/r/319474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6c1a4af34157384aded880c13078a647e342588 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: TheDJ Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Rework Template:Multiple_image hack
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/319474 Change subject: Rework Template:Multiple_image hack .. Rework Template:Multiple_image hack - Move it into the hacks file where it belongs. - Only apply when under tablet-width - Add comment referring to tickets for future reference - Use display box to - align center - wrap sibling images to the next line if needed - make sure a thumbcaption child is always on it's own line Bug: T148505 Change-Id: Ib6c1a4af34157384aded880c13078a647e342588 --- M resources/skins.minerva.content.styles/hacks.less M resources/skins.minerva.content.styles/thumbnails.less 2 files changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/74/319474/1 diff --git a/resources/skins.minerva.content.styles/hacks.less b/resources/skins.minerva.content.styles/hacks.less index 41950cc..f426485 100644 --- a/resources/skins.minerva.content.styles/hacks.less +++ b/resources/skins.minerva.content.styles/hacks.less @@ -132,5 +132,17 @@ } } } + // Deal with Template:Multiple_image. T38030 and T148505 + .thumb .thumbinner { + > div { + .flex-display( flex ); + justify-content: center; + flex-wrap: wrap; + align-content: flex-start; + } + > .thumbcaption { + .flex( 1, 0, 100% ); + } + } } } diff --git a/resources/skins.minerva.content.styles/thumbnails.less b/resources/skins.minerva.content.styles/thumbnails.less index 25a7507..8da82bd 100644 --- a/resources/skins.minerva.content.styles/thumbnails.less +++ b/resources/skins.minerva.content.styles/thumbnails.less @@ -21,12 +21,6 @@ margin: 0 auto; // !important is needed because of Bug T87198 for example max-width: 100% !important; - - > div { - float: none !important; - width: auto !important; - clear: both !important; - } } /* bug 20030 */ -- To view, visit https://gerrit.wikimedia.org/r/319474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6c1a4af34157384aded880c13078a647e342588 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: TheDJ ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits