| Index: branches/wmf/1.17wmf1/skins/common/commonPrint.css |
| — | — | @@ -232,31 +232,35 @@ |
| 233 | 233 | |
| 234 | 234 | #siteNotice { display: none; } |
| 235 | 235 | |
| 236 | | -/* image galleries */ |
| 237 | | -table.gallery { |
| 238 | | - border: 1px solid #ccc; |
| 239 | | - margin: 2px; |
| 240 | | - padding: 2px; |
| 241 | | - background-color: white; |
| 242 | | - border-collapse: collapse; |
| 243 | | -} |
| 244 | | - |
| 245 | | -table.gallery tr { |
| | 236 | +/* Galleries (see shared.css for more info) */ |
| | 237 | +li.gallerybox { |
| 246 | 238 | vertical-align: top; |
| | 239 | + background-color: #f9f9f9; |
| | 240 | + border: solid 2px white; |
| | 241 | + display: -moz-inline-box; |
| | 242 | + display: inline-block; |
| 247 | 243 | } |
| 248 | 244 | |
| 249 | | -table.gallery td { |
| 250 | | - vertical-align: top; |
| 251 | | - padding: 1px; |
| 252 | | - border: 1px solid #ccc; |
| | 245 | +ul.gallery, li.gallerybox { |
| | 246 | + zoom: 1; |
| | 247 | + *display: inline; |
| 253 | 248 | } |
| 254 | 249 | |
| 255 | | -div.gallerybox { |
| | 250 | +ul.gallery { |
| 256 | 251 | margin: 2px; |
| | 252 | + padding: 2px; |
| | 253 | + display: block; |
| 257 | 254 | } |
| 258 | 255 | |
| 259 | | -div.gallerybox div.thumb { |
| | 256 | +li.gallerycaption { |
| | 257 | + font-weight: bold; |
| 260 | 258 | text-align: center; |
| | 259 | + display: block; |
| | 260 | + word-wrap: break-word; |
| | 261 | +} |
| | 262 | + |
| | 263 | +li.gallerybox div.thumb { |
| | 264 | + text-align: center; |
| 261 | 265 | border: 1px solid #ccc; |
| 262 | 266 | margin: 2px; |
| 263 | 267 | } |
| — | — | @@ -265,8 +269,8 @@ |
| 266 | 270 | overflow: hidden; |
| 267 | 271 | font-size: 94%; |
| 268 | 272 | padding: 2px 4px; |
| | 273 | + word-wrap: break-word; |
| 269 | 274 | } |
| 270 | | - |
| 271 | 275 | /* |
| 272 | 276 | ** Diff rendering |
| 273 | 277 | */ |
| Index: branches/wmf/1.17wmf1/skins/common/shared.css |
| — | — | @@ -748,6 +748,7 @@ |
| 749 | 749 | |
| 750 | 750 | /* Galleries */ |
| 751 | 751 | /* These display attributes look nonsensical, but are needed to support IE and FF2 */ |
| | 752 | +/* Don't forget to update commonPrint.css */ |
| 752 | 753 | li.gallerybox { |
| 753 | 754 | vertical-align: top; |
| 754 | 755 | background-color: #f9f9f9; |
| — | — | @@ -764,7 +765,6 @@ |
| 765 | 766 | ul.gallery { |
| 766 | 767 | margin: 2px; |
| 767 | 768 | padding: 2px; |
| 768 | | - background-color: white; |
| 769 | 769 | display: block; |
| 770 | 770 | } |
| 771 | 771 | |
| Property changes on: branches/wmf/1.17wmf1/skins/common/shared.css |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 772 | 772 | Merged /trunk/phase3/skins/common/shared.css:r82748,87840,89401,89697 |
| Index: branches/wmf/1.17wmf1/includes/libs/CSSMin.php |
| — | — | @@ -120,8 +120,9 @@ |
| 121 | 121 | self::URL_REGEX . '(?P<post>[^;]*)[\;]?/'; |
| 122 | 122 | $offset = 0; |
| 123 | 123 | while ( preg_match( $pattern, $source, $match, PREG_OFFSET_CAPTURE, $offset ) ) { |
| 124 | | - // Skip absolute URIs |
| 125 | | - if ( preg_match( '/^https?:\/\//', $match['file'][0] ) ) { |
| | 124 | + // Skip fully-qualified URLs and data URIs |
| | 125 | + $urlScheme = parse_url( $match['file'][0], PHP_URL_SCHEME ); |
| | 126 | + if ( $urlScheme ) { |
| 126 | 127 | // Move the offset to the end of the match, leaving it alone |
| 127 | 128 | $offset = $match[0][1] + strlen( $match[0][0] ); |
| 128 | 129 | continue; |
| Index: branches/wmf/1.17wmf1/resources/Resources.php |
| — | — | @@ -78,6 +78,7 @@ |
| 79 | 79 | 'jquery.suggestions' => array( |
| 80 | 80 | 'scripts' => 'resources/jquery/jquery.suggestions.js', |
| 81 | 81 | 'styles' => 'resources/jquery/jquery.suggestions.css', |
| | 82 | + 'dependencies' => 'jquery.autoEllipsis', |
| 82 | 83 | ), |
| 83 | 84 | 'jquery.tabIndex' => array( |
| 84 | 85 | 'scripts' => 'resources/jquery/jquery.tabIndex.js' |
| Property changes on: branches/wmf/1.17wmf1/resources/Resources.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 85 | 86 | Merged /trunk/phase3/resources/Resources.php:r89401,89697 |