Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F7019
new.diff
Public
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Authored By
•
bzimport
Nov 21 2014, 11:12 PM
2014-11-21 23:12:52 (UTC+0)
Size
1 KB
Referenced Files
None
Subscribers
None
new.diff
View Options
Index: skins/common/shared.css
===================================================================
--- skins/common/shared.css (revision 82252)
+++ skins/common/shared.css (working copy)
@@ -763,7 +763,6 @@
ul.gallery {
margin: 2px;
padding: 2px;
- background-color: white;
display: block;
}
@@ -780,10 +779,6 @@
margin: 2px;
}
-li.gallerybox div.thumb a.image img {
- vertical-align: text-top;
-}
-
div.gallerytext {
overflow: hidden;
font-size: 94%;
Index: includes/ImageGallery.php
===================================================================
--- includes/ImageGallery.php (revision 82252)
+++ includes/ImageGallery.php (working copy)
@@ -275,7 +275,11 @@
$thumbhtml = "\n\t\t\t".'<div style="height: '.(30 + $this->mHeights).'px;">'
. htmlspecialchars( $img->getLastError() ) . '</div>';
} else {
- $vpad = floor(( 30 + $this->mHeights - $thumb->height ) /2);
+ //We get layout problems with the margin, if the image is smaller
+ //than the line-height, so we less margin in these cases.
+ $minThumbHeight = $thumb->height > 17 ? $thumb->height : 17;
+ $vpad = floor(( 30 + $this->mHeights - $minThumbHeight ) /2);
+
$imageParameters = array(
'desc-link' => true,
@@ -288,11 +292,11 @@
# Set both fixed width and min-height.
$thumbhtml = "\n\t\t\t".
- '<div class="thumb" style="width: ' .($this->mWidths+30).'px; height: ' .($this->mHeights+30).'px;">'
+ '<div class="thumb" style="width: ' .($this->mWidths+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:'.$vpad.'px auto 0;">'
+ . '<div style="margin:'.$vpad.'px auto;">'
. $thumb->toHtml( $imageParameters ) . '</div></div>';
// Call parser transform hook
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6556
Default Alt Text
new.diff (1 KB)
Attached To
Mode
T29338: Gallery in 1.17 breaks for audio/video + ogghandler
Attached
Detach File
Event Timeline
Log In to Comment