Page MenuHomePhabricator
Authored By
bzimport
Nov 21 2014, 8:48 PM
Size
2 KB
Referenced Files
None
Subscribers
None
Index: skins/common/shared.css
===================================================================
--- skins/common/shared.css (Revision 77483)
+++ skins/common/shared.css (Arbeitskopie)
@@ -823,6 +823,7 @@
overflow: hidden;
font-size: 94%;
padding: 2px 4px;
+ word-wrap: break-word;
}
table.mw-enhanced-rc {
Index: includes/ImageGallery.php
===================================================================
--- includes/ImageGallery.php (Revision 77483)
+++ includes/ImageGallery.php (Arbeitskopie)
@@ -257,11 +257,11 @@
if( !$img ) {
# We're dealing with a non-image, spit out the name and be done with it.
- $thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">'
+ $thumbhtml = "\n\t\t\t".'<div style="height: '.(30 + $this->mHeights).'px;">'
. htmlspecialchars( $nt->getText() ) . '</div>';
} elseif( $this->mHideBadImages && wfIsBadImage( $nt->getDBkey(), $this->getContextTitle() ) ) {
# The image is blacklisted, just show it as a text link.
- $thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">' .
+ $thumbhtml = "\n\t\t\t".'<div style="height: '.(30 + $this->mHeights).'px;">' .
$sk->link(
$nt,
htmlspecialchars( $nt->getText() ),
@@ -272,10 +272,10 @@
'</div>';
} elseif( !( $thumb = $img->transform( $params ) ) ) {
# Error generating thumbnail.
- $thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">'
+ $thumbhtml = "\n\t\t\t".'<div style="height: '.(30 + $this->mHeights).'px;">'
. htmlspecialchars( $img->getLastError() ) . '</div>';
} else {
- $vpad = floor( ( 1.25*$this->mHeights - $thumb->height ) /2 ) - 2;
+ $vpad = floor(( 30 + $this->mHeights - $thumb->height ) /2);
$imageParameters = array(
'desc-link' => true,
@@ -285,13 +285,15 @@
if ( $text == '' ) {
$imageParameters['alt'] = $nt->getText();
}
-
+
+ # Set both fixed width and height. Otherwise we might have problems
+ # with the vertical centering of images where height<line-size
$thumbhtml = "\n\t\t\t".
- '<div class="thumb" style="padding: ' . $vpad . 'px 0; width: ' .($this->mWidths+30).'px;">'
+ '<div class="thumb" style="width: ' .($this->mWidths+30).'px; height: ' .($this->mHeights+30).'px;">'
# Auto-margin centering for block-level elements. Needed now that we have video
# handlers since they may emit block-level elements as opposed to simple <img> tags.
# ref http://css-discuss.incutio.com/?page=CenteringBlockElement
- . '<div style="margin-left: auto; margin-right: auto; width: ' .$this->mWidths.'px;">'
+ . '<div style="margin:'.$vpad.'px auto;">'
. $thumb->toHtml( $imageParameters ) . '</div></div>';
// Call parser transform hook

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1859
Default Alt Text
a.diff (2 KB)

Event Timeline