| Index: branches/wmf/1.16wmf4/skins/Vector.php |
| — | — | @@ -279,7 +279,7 @@ |
| 280 | 280 | // Checks if the user is logged in |
| 281 | 281 | if ( $this->loggedin ) { |
| 282 | 282 | if ( $wgVectorUseIconWatch ) { |
| 283 | | - $class = 'icon '; |
| | 283 | + $class = 'icon'; |
| 284 | 284 | $place = 'views'; |
| 285 | 285 | } else { |
| 286 | 286 | $class = ''; |
| — | — | @@ -757,7 +757,7 @@ |
| 758 | 758 | <?php if ( $wgVectorUseSimpleSearch && $wgUser->getOption( 'vector-simplesearch' ) ): ?> |
| 759 | 759 | <div id="simpleSearch"> |
| 760 | 760 | <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> /> |
| 761 | | - <button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>> </button> |
| | 761 | + <button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>><img src="<?php echo $GLOBALS['wgStylePath'] . "/{$this->skin->stylename}/images/search-" . ( $GLOBALS['wgContLang']->isRTL() ? 'rtl' : 'ltr' ) . '.png?' . $GLOBALS['wgStyleVersion'] ?>" alt="<?php $this->msg( 'searchbutton' ) ?>" /></button> |
| 762 | 762 | </div> |
| 763 | 763 | <?php else: ?> |
| 764 | 764 | <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> /> |
| Property changes on: branches/wmf/1.16wmf4/skins/Vector.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 765 | 765 | Merged /trunk/phase3/skins/Vector.php:r65036,65063,69335-69336,69340,69482,69538-69539,69570 |
| Index: branches/wmf/1.16wmf4/skins/vector/main-ltr.css |
| — | — | @@ -351,6 +351,7 @@ |
| 352 | 352 | #simpleSearch { |
| 353 | 353 | margin-top: 0.65em; |
| 354 | 354 | position: relative; |
| | 355 | + min-height: 1px; /* Gotta trigger hasLayout for IE7 */ |
| 355 | 356 | border: solid 1px #AAAAAA; |
| 356 | 357 | background-color: white; |
| 357 | 358 | background-image: url(images/search-fade.png?1); |
| — | — | @@ -361,7 +362,13 @@ |
| 362 | 363 | font-size: 13px; |
| 363 | 364 | top: 0.25em; |
| 364 | 365 | } |
| 365 | | - #simpleSearch input#searchInput { |
| | 366 | + div#simpleSearch .placeholder { |
| | 367 | + color: #999999; |
| | 368 | + } |
| | 369 | + div#simpleSearch input::-webkit-input-placeholder { |
| | 370 | + color: #999999; |
| | 371 | + } |
| | 372 | + div#simpleSearch input#searchInput { |
| 366 | 373 | margin: 0; |
| 367 | 374 | border-width: 0; |
| 368 | 375 | padding: 3px; |
| — | — | @@ -373,27 +380,18 @@ |
| 374 | 381 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 375 | 382 | #simpleSearch button#searchButton { |
| 376 | 383 | padding: 0; |
| 377 | | - margin: 5px 5px 0 5px; |
| 378 | | - height: 13px; |
| 379 | | - width: 12px; |
| | 384 | + margin: 0 5px; |
| 380 | 385 | border: none; |
| 381 | 386 | cursor: pointer; |
| 382 | 387 | background-color: transparent; |
| 383 | | - background-image: url(images/search-ltr.png?1); |
| 384 | | - background-position: center center; |
| 385 | | - background-repeat: no-repeat; |
| | 388 | + font-size: x-small; |
| 386 | 389 | } |
| 387 | | - .suggestions-special .special-label { |
| 388 | | - font-size: 0.8em; |
| 389 | | - color: gray; |
| | 390 | + div#simpleSearch button#searchButton img { |
| | 391 | + border: none; |
| | 392 | + margin: 0; |
| | 393 | + padding: 0; |
| | 394 | + vertical-align: middle; |
| 390 | 395 | } |
| 391 | | - .suggestions-special .special-query { |
| 392 | | - color: black; |
| 393 | | - font-style: italic; |
| 394 | | - } |
| 395 | | - .suggestions-special .special-hover { |
| 396 | | - background-color: silver; |
| 397 | | - } |
| 398 | 396 | /* Panel */ |
| 399 | 397 | div#mw-panel { |
| 400 | 398 | position: absolute; |
| — | — | @@ -728,7 +726,11 @@ |
| 729 | 727 | font-style: italic; |
| 730 | 728 | }*/ |
| 731 | 729 | pre, code, tt { |
| 732 | | - font-family: monospace, sans-serif; |
| | 730 | + /* |
| | 731 | + * It's important for this rule to first reference an actual font name, some browsers will render the monospace text |
| | 732 | + * too small otherwise, namely Firefox, Chrome and Safari |
| | 733 | + */ |
| | 734 | + font-family: monospace, "Courier New"; |
| 733 | 735 | } |
| 734 | 736 | code { |
| 735 | 737 | background-color: #f9f9f9; |
| Index: branches/wmf/1.16wmf4/skins/vector/main-rtl.css |
| — | — | @@ -351,6 +351,7 @@ |
| 352 | 352 | #simpleSearch { |
| 353 | 353 | margin-top: 0.65em; |
| 354 | 354 | position: relative; |
| | 355 | + min-height: 1px; /* Gotta trigger hasLayout for IE7 */ |
| 355 | 356 | border: solid 1px #AAAAAA; |
| 356 | 357 | background-color: white; |
| 357 | 358 | background-image: url(images/search-fade.png?1); |
| — | — | @@ -361,7 +362,13 @@ |
| 362 | 363 | font-size: 13px; |
| 363 | 364 | top: 0.25em; |
| 364 | 365 | } |
| 365 | | - #simpleSearch input#searchInput { |
| | 366 | + div#simpleSearch .placeholder { |
| | 367 | + color: #999999; |
| | 368 | + } |
| | 369 | + div#simpleSearch input::-webkit-input-placeholder { |
| | 370 | + color: #999999; |
| | 371 | + } |
| | 372 | + div#simpleSearch input#searchInput { |
| 366 | 373 | margin: 0; |
| 367 | 374 | border-width: 0; |
| 368 | 375 | padding: 3px; |
| — | — | @@ -373,27 +380,18 @@ |
| 374 | 381 | /* OVERRIDDEN BY COMPLIANT BROWSERS */ |
| 375 | 382 | #simpleSearch button#searchButton { |
| 376 | 383 | padding: 0; |
| 377 | | - margin: 5px 5px 0 5px; |
| 378 | | - height: 13px; |
| 379 | | - width: 12px; |
| | 384 | + margin: 0 5px; |
| 380 | 385 | border: none; |
| 381 | 386 | cursor: pointer; |
| 382 | 387 | background-color: transparent; |
| 383 | | - background-image: url(images/search-rtl.png?1); |
| 384 | | - background-position: center center; |
| 385 | | - background-repeat: no-repeat; |
| | 388 | + font-size: x-small; |
| 386 | 389 | } |
| 387 | | - .suggestions-special .special-label { |
| 388 | | - font-size: 0.8em; |
| 389 | | - color: gray; |
| | 390 | + div#simpleSearch button#searchButton img { |
| | 391 | + border: none; |
| | 392 | + margin: 0; |
| | 393 | + padding: 0; |
| | 394 | + vertical-align: middle; |
| 390 | 395 | } |
| 391 | | - .suggestions-special .special-query { |
| 392 | | - color: black; |
| 393 | | - font-style: italic; |
| 394 | | - } |
| 395 | | - .suggestions-special .special-hover { |
| 396 | | - background-color: silver; |
| 397 | | - } |
| 398 | 396 | /* Panel */ |
| 399 | 397 | div#mw-panel { |
| 400 | 398 | position: absolute; |
| — | — | @@ -728,7 +726,11 @@ |
| 729 | 727 | font-style: italic; |
| 730 | 728 | }*/ |
| 731 | 729 | pre, code, tt { |
| 732 | | - font-family: monospace, sans-serif; |
| | 730 | + /* |
| | 731 | + * It's important for this rule to first reference an actual font name, some browsers will render the monospace text |
| | 732 | + * too small otherwise, namely Firefox, Chrome and Safari |
| | 733 | + */ |
| | 734 | + font-family: monospace, "Courier New"; |
| 733 | 735 | } |
| 734 | 736 | code { |
| 735 | 737 | background-color: #f9f9f9; |
| Property changes on: branches/wmf/1.16wmf4/skins/vector |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 736 | 738 | Merged /trunk/phase3/skins/vector:r65036,65063,68798,69335-69336,69340,69482,69538-69539,69570 |
| Property changes on: branches/wmf/1.16wmf4/skins |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 737 | 739 | Merged /trunk/phase3/skins:r65036,65063,69335-69336,69340,69482,69538-69539,69570 |