Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix thumb styling on file description page

Browse source 
The styling to date only considered parser contexts, where the page
content language would be set.  However, thumbnails are used in other
places, like the file description page.

Bug: T337804
Change-Id: I23a2c4f812c57cbd7801c4d5aae84ca4d696d542
This commit is contained in:
Arlo Breault 2023-05-31 19:25:42 -04:00
parent aaf16eadbf
commit ccdcfdccd2
4 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/linker/Linker.php
View file

@ -812,9 +812,11 @@ class Linker {
'img-class' => 'mw-file-element',
];
// Only thumbs gets the magnify link
if ( $rdfaType === 'mw:File/Thumb' && $parser ) {
if ( $rdfaType === 'mw:File/Thumb' ) {
$params['magnify-resource'] = $url;
$parser->getOutput()->addModules( [ 'mediawiki.page.media' ] );
if ( $parser ) {
$parser->getOutput()->addModules( [ 'mediawiki.page.media' ] );
}
}
}
$params = self::getImageLinkMTOParams( $frameParams, $query, $parser ) + $params;

1
includes/page/ImagePage.php
View file

@ -485,6 +485,7 @@ class ImagePage extends Article {
$linkPrev = $linkNext = '';
$count = $this->displayImg->pageCount();
$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
$out->addModules( 'mediawiki.page.media' );
if ( $page > 1 ) {
$label = $context->msg( 'imgmultipageprev' )->text();

14
resources/src/mediawiki.skinning/content.media-common.less
View file

@ -56,8 +56,6 @@ figure[ typeof~='mw:File/Frameless' ] {
figure[ typeof~='mw:File/Thumb' ],
figure[ typeof~='mw:File/Frame' ] {
margin: 0; // Maybe belongs in element.css for figure
margin-bottom: @margin-bottom-thumb;
display: table;
text-align: center;
border-collapse: collapse;
@ -71,6 +69,12 @@ figure[ typeof~='mw:File/Frame' ] {
}
}
// Default where page content language is not set
// Allow to flip
margin: @margin-tright;
clear: right;
float: right;
// Defaults for page content language
.mw-content-ltr & {
@ -176,6 +180,12 @@ figure[ typeof~='mw:File/Frame' ] {
*/
word-break: break-word;
// Default where page content language is not set
// Allow to flip
text-align: left;
// Defaults for page content language
.mw-content-ltr & {
/* @noflip */
text-align: left;

14
resources/src/mediawiki.skinning/content.media-screen.less
View file

@ -33,6 +33,13 @@ figure[ typeof~='mw:File/Thumb' ] {
width: 15px;
height: 11px;
// Default where page content language is not set
// Allow to flip
margin-left: 3px;
float: right;
// Defaults for page content language
.mw-content-ltr & {
/* @noflip */
margin-left: 3px;
@ -60,6 +67,13 @@ figure[ typeof~='mw:File/Thumb' ] {
position: absolute;
bottom: -11px;
// Default where page content language is not set
// Allow to flip
right: 6px;
background-image: @background-image-magnify-ltr;
// Defaults for page content language
.mw-content-ltr & {
/* @noflip */
right: 6px;