| Index: branches/REL1_18/extensions/Collection/Collection.hooks.php |
| — | — | @@ -245,7 +245,7 @@ |
| 246 | 246 | 'alt' => '', |
| 247 | 247 | 'width' => '80', |
| 248 | 248 | 'height' => '45', |
| 249 | | - 'class' => 'mw-float-start collection-creatorbox-book', |
| | 249 | + 'class' => 'collection-creatorbox-book', |
| 250 | 250 | ), |
| 251 | 251 | '', |
| 252 | 252 | true |
| — | — | @@ -253,8 +253,7 @@ |
| 254 | 254 | |
| 255 | 255 | $html .= Xml::tags( 'div', |
| 256 | 256 | array( 'class' => 'collection-creatorbox-row' ), |
| 257 | | - Xml::tags( 'div', |
| 258 | | - array( 'class' => 'mw-float-end' ), |
| | 257 | + Xml::tags( 'div', null, |
| 259 | 258 | $skin->link( |
| 260 | 259 | Title::newFromText( wfMsg( 'coll-helppage' ) ), |
| 261 | 260 | Xml::element( 'img', |
| — | — | @@ -263,7 +262,6 @@ |
| 264 | 263 | 'alt' => '', |
| 265 | 264 | 'width' => '16', |
| 266 | 265 | 'height' => '16', |
| 267 | | - 'style' => 'vertical-align: text-bottom;', |
| 268 | 266 | ) |
| 269 | 267 | ) |
| 270 | 268 | . ' ' . wfMsgHtml( 'coll-help' ), |
| Index: branches/REL1_18/extensions/Collection/js/bookcreator.css |
| — | — | @@ -13,6 +13,7 @@ |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | 16 | .collection-column { |
| | 17 | + float: left; |
| 17 | 18 | width: 47%; |
| 18 | 19 | } |
| 19 | 20 | |
| — | — | @@ -116,6 +117,10 @@ |
| 117 | 118 | margin-bottom: 0; |
| 118 | 119 | } |
| 119 | 120 | |
| | 121 | +.collection-creatorbox-book { |
| | 122 | + float: left; |
| | 123 | +} |
| | 124 | + |
| 120 | 125 | /* Trivial but nicer for the browsers that support it */ |
| 121 | 126 | .rtl .collection-creatorbox-book { |
| 122 | 127 | --ms-transform: scaleX(-1); |
| — | — | @@ -134,6 +139,18 @@ |
| 135 | 140 | margin-left: 10px; |
| 136 | 141 | } |
| 137 | 142 | |
| | 143 | +.collection-creatorbox-row div { |
| | 144 | + float: right; |
| | 145 | +} |
| | 146 | + |
| 138 | 147 | .collection-creatorbox-row img { |
| 139 | 148 | vertical-align: text-bottom; |
| 140 | | -} |
| \ No newline at end of file |
| | 149 | +} |
| | 150 | + |
| | 151 | +#collection-suggest-add, |
| | 152 | +#collection-order-button, |
| | 153 | +#collection-download-button, |
| | 154 | +#collection-save-button, |
| | 155 | +#collection-save-input { |
| | 156 | + float: right; |
| | 157 | +} |
| Index: branches/REL1_18/extensions/Collection/Collection.templates.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | $mediapath = $GLOBALS['wgScriptPath'] . '/extensions/Collection/images/'; |
| 17 | 17 | ?> |
| 18 | 18 | |
| 19 | | -<div class="mw-float-start collection-column collection-column-left"> |
| | 19 | +<div class="collection-column collection-column-left"> |
| 20 | 20 | |
| 21 | 21 | <form action="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book' ) ) ?>" method="post" id="mw-collection-title-form"> |
| 22 | 22 | <table id="mw-collection-title-table" style="width: 80%; background-color: transparent;" align="center"> |
| — | — | @@ -51,7 +51,7 @@ |
| 52 | 52 | |
| 53 | 53 | </div> |
| 54 | 54 | |
| 55 | | -<div class="mw-float-start collection-column collection-column-right"> |
| | 55 | +<div class="collection-column collection-column-right"> |
| 56 | 56 | |
| 57 | 57 | <div class="collection-column-right-box"> |
| 58 | 58 | <h2><span class="mw-headline"><?php $this->msg( 'coll-book_title' ) ?></span></h2> |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | $this->msgWiki( 'coll-book_text' ); |
| 62 | 62 | ?> |
| 63 | 63 | <div> |
| 64 | | - <div class="mw-float-end"> |
| | 64 | + <div id="collection-order-button"> |
| 65 | 65 | <form action="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book' ) ) ?>" method="post"> |
| 66 | 66 | <input type="hidden" name="bookcmd" value="post_zip" /> |
| 67 | 67 | <input type="hidden" name="partner" value="pediapress" /> |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | <?php } ?> |
| 114 | 114 | </select> |
| 115 | 115 | <?php } ?> |
| 116 | | - </td><td class="mw-align-end" style="vertical-align:bottom;"> |
| | 116 | + </td><td id="collection-download-button"> |
| 117 | 117 | <input type="hidden" name="bookcmd" value="render" /> |
| 118 | 118 | <input id="downloadButton" type="submit" value="<?php echo $buttonLabel ?>"<?php if ( count( $this->data['collection']['items'] ) == 0 ) { ?> disabled="disabled"<?php } ?> /> |
| 119 | 119 | </td></tr></tbody></table> |
| — | — | @@ -146,7 +146,7 @@ |
| 147 | 147 | <?php } ?> |
| 148 | 148 | <label for="personalCollTitle"><a href="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Prefixindex', 'prefix=' . wfUrlencode( $this->data['user-book-prefix'] ) ) ) ?>"><?php echo htmlspecialchars( $this->data['user-book-prefix'] ) ?></a></label> |
| 149 | 149 | </td> |
| 150 | | - <td class="mw-align-end"> |
| | 150 | + <td id="collection-save-input"> |
| 151 | 151 | <input id="personalCollTitle" type="text" name="pcollname" /> |
| 152 | 152 | </td></tr> |
| 153 | 153 | <?php } // if ($canSaveUserPage) ?> |
| — | — | @@ -159,11 +159,11 @@ |
| 160 | 160 | <?php } ?> |
| 161 | 161 | <label for="communityCollTitle"><a href="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Prefixindex', 'prefix=' . wfUrlencode( $this->data['community-book-prefix'] ) ) ) ?>"><?php echo htmlspecialchars( $this->data['community-book-prefix'] ) ?></a></label> |
| 162 | 162 | </td> |
| 163 | | - <td class="mw-align-end"> |
| | 163 | + <td id="collection-save-button"> |
| 164 | 164 | <input id="communityCollTitle" type="text" name="ccollname" disabled="disabled" /> |
| 165 | 165 | </td></tr> |
| 166 | 166 | <?php } // if ($canSaveCommunityPage) ?> |
| 167 | | - <tr><td> </td><td class="mw-align-end"> |
| | 167 | + <tr><td> </td><td id="collection-save-button"> |
| 168 | 168 | <input id="saveButton" type="submit" value="<?php $this->msg( 'coll-save_collection' ) ?>"<?php if ( count( $this->data['collection']['items'] ) == 0 ) { ?> disabled="disabled"<?php } ?> /> |
| 169 | 169 | </tr></tbody></table> |
| 170 | 170 | <input name="token" type="hidden" value="<?php echo htmlspecialchars( $GLOBALS['wgUser']->editToken() ) ?>" /> |
| — | — | @@ -418,7 +418,7 @@ |
| 419 | 419 | (<a href="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book', array( 'bookcmd' => 'suggest', 'resetbans' => '1' ) ) ) ?>" title="<?php $this->msg( 'coll-suggest_reset_bans_tooltip' ) ?>"><?php $this->msg( 'coll-suggest_reset_bans' ) ?></a>) |
| 420 | 420 | <?php if ( count( $this->data['proposals'] ) > 0 ) { ?> |
| 421 | 421 | <noscript> |
| 422 | | - <div class="mw-float-end"> |
| | 422 | + <div id="collection-suggest-add"> |
| 423 | 423 | <input type="submit" value="<?php $this->msg( 'coll-suggest_add_selected' ) ?>" name="addselected" /> |
| 424 | 424 | </div> |
| 425 | 425 | </noscript> |
| Index: branches/REL1_18/phase3/skins/common/shared.css |
| — | — | @@ -18,11 +18,6 @@ |
| 19 | 19 | /* @noflip */textarea[dir="ltr"], input[dir="ltr"] { direction: ltr; } |
| 20 | 20 | /* @noflip */textarea[dir="rtl"], input[dir="rtl"] { direction: rtl; } |
| 21 | 21 | |
| 22 | | -.mw-float-start { float: left; } |
| 23 | | -.mw-float-end { float: right; } |
| 24 | | -.mw-align-start { text-align: left; } |
| 25 | | -.mw-align-end { text-align: right; } |
| 26 | | - |
| 27 | 22 | /* The scripts of these languages are very hard to read with underlines */ |
| 28 | 23 | [lang="ar"] a, [lang="ckb"] a, [lang="fa"] a, [lang="kk-arab"] a, |
| 29 | 24 | [lang="mzn"] a, [lang="ps"] a, [lang="ur"] a { |
| — | — | @@ -296,6 +291,10 @@ |
| 297 | 292 | border: 1px dashed #aaa; |
| 298 | 293 | } |
| 299 | 294 | |
| | 295 | +.mw-history-revisiondelete-button, #mw-fileduplicatesearch-icon { |
| | 296 | + float: right; |
| | 297 | +} |
| | 298 | + |
| 300 | 299 | /** Generic minor/bot/newpage styling */ |
| 301 | 300 | .newpage, .minor, .bot { |
| 302 | 301 | font-weight: bold; |
| Index: branches/REL1_18/phase3/includes/HistoryPage.php |
| — | — | @@ -420,7 +420,7 @@ |
| 421 | 421 | 'type' => 'submit', |
| 422 | 422 | 'name' => $name, |
| 423 | 423 | 'value' => '1', |
| 424 | | - 'class' => "mw-history-$name-button mw-float-end", |
| | 424 | + 'class' => "mw-history-$name-button", |
| 425 | 425 | ), |
| 426 | 426 | wfMsg( $msg ) |
| 427 | 427 | ) . "\n"; |
| Property changes on: branches/REL1_18/phase3/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 428 | 428 | Merged /trunk/phase3/includes/HistoryPage.php:r96406 |
| Index: branches/REL1_18/phase3/includes/specials/SpecialFileDuplicateSearch.php |
| — | — | @@ -131,7 +131,7 @@ |
| 132 | 132 | if ( $img ) { |
| 133 | 133 | $thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) ); |
| 134 | 134 | if( $thumb ) { |
| 135 | | - $wgOut->addHTML( '<div class="mw-float-end" id="mw-fileduplicatesearch-icon">' . |
| | 135 | + $wgOut->addHTML( '<div id="mw-fileduplicatesearch-icon">' . |
| 136 | 136 | $thumb->toHtml( array( 'desc-link' => false ) ) . '<br />' . |
| 137 | 137 | wfMsgExt( 'fileduplicatesearch-info', array( 'parse' ), |
| 138 | 138 | $wgLang->formatNum( $img->getWidth() ), |