| Index: branches/wmf/1.17wmf1/skins/chick/main.css |
| — | — | @@ -146,12 +146,6 @@ |
| 147 | 147 | color: black; |
| 148 | 148 | vertical-align: top; |
| 149 | 149 | } |
| 150 | | -abbr, acronym, .explain { |
| 151 | | - border-bottom: 1px dotted black; |
| 152 | | - color: black; |
| 153 | | - background: none; |
| 154 | | - cursor: help; |
| 155 | | -} |
| 156 | 150 | q { |
| 157 | 151 | font-family: Times, "Times New Roman", serif; |
| 158 | 152 | font-style: italic; |
| Index: branches/wmf/1.17wmf1/skins/monobook/main.css |
| — | — | @@ -195,12 +195,6 @@ |
| 196 | 196 | select { |
| 197 | 197 | vertical-align: top; |
| 198 | 198 | } |
| 199 | | -abbr, acronym, .explain { |
| 200 | | - border-bottom: 1px dotted black; |
| 201 | | - color: black; |
| 202 | | - background: none; |
| 203 | | - cursor: help; |
| 204 | | -} |
| 205 | 199 | q { |
| 206 | 200 | font-family: Times, "Times New Roman", serif; |
| 207 | 201 | font-style: italic; |
| Index: branches/wmf/1.17wmf1/skins/common/shared.css |
| — | — | @@ -4,6 +4,12 @@ |
| 5 | 5 | * another, but don't ignore the poor non-Monobook users either. |
| 6 | 6 | */ |
| 7 | 7 | |
| | 8 | +/* Default style for semantic tags */ |
| | 9 | +abbr, acronym, .explain { |
| | 10 | + border-bottom: 1px dotted black; |
| | 11 | + cursor: help; |
| | 12 | +} |
| | 13 | + |
| 8 | 14 | /* Colored watchlist and recent changes numbers */ |
| 9 | 15 | .mw-plusminus-pos { color: #006400; } /* dark green */ |
| 10 | 16 | .mw-plusminus-neg { color: #8b0000; } /* dark red */ |
| Property changes on: branches/wmf/1.17wmf1/skins/common/shared.css |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 11 | 17 | Merged /trunk/phase3/skins/common/shared.css:r87423,88118,88124,88211,88498,89099,89401,89451 |
| Index: branches/wmf/1.17wmf1/skins/vector/screen.css |
| — | — | @@ -754,16 +754,8 @@ |
| 755 | 755 | margin: .4em 0 .5em 0; |
| 756 | 756 | line-height: 1.5em; |
| 757 | 757 | } |
| 758 | | - p img { |
| 759 | | - margin: 0; |
| 760 | | - } |
| 761 | | -abbr, |
| 762 | | -acronym, |
| 763 | | -.explain { |
| 764 | | - border-bottom: 1px dotted black; |
| 765 | | - color: black; |
| 766 | | - background: none; |
| 767 | | - cursor: help; |
| | 758 | +p img { |
| | 759 | + margin: 0; |
| 768 | 760 | } |
| 769 | 761 | q { |
| 770 | 762 | font-family: Times, "Times New Roman", serif; |
| Property changes on: branches/wmf/1.17wmf1/skins/vector/screen.css |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 771 | 763 | Merged /trunk/phase3/skins/vector/screen.css:r87423,88118,88124,88211,88498,89099,89401,89451 |
| Index: branches/wmf/1.17wmf1/includes/installer/Installer.i18n.php |
| — | — | @@ -415,7 +415,7 @@ |
| 416 | 416 | 'config-upload-deleted-help' => 'Choose a directory in which to archive deleted files. |
| 417 | 417 | Ideally, this should not be accessible from the web.', |
| 418 | 418 | 'config-logo' => 'Logo URL:', |
| 419 | | - 'config-logo-help' => "MediaWiki's default skin includes space for a 135x160 pixel logo in the top left corner. |
| | 419 | + 'config-logo-help' => "MediaWiki's default skin includes space for a 135x160 pixel logo above the sidebar menu. |
| 420 | 420 | Upload an image of the appropriate size, and enter the URL here. |
| 421 | 421 | |
| 422 | 422 | If you do not want a logo, leave this box blank.", |
| Index: branches/wmf/1.17wmf1/includes/api/ApiParse.php |
| — | — | @@ -516,7 +516,6 @@ |
| 517 | 517 | ' headhtml - Gives parsed <head> of the page', |
| 518 | 518 | ' iwlinks - Gives interwiki links in the parsed wikitext', |
| 519 | 519 | ' wikitext - Gives the original wikitext that was parsed', |
| 520 | | - 'NOTE: Section tree is only generated if there are more than 4 sections, or if the __TOC__ keyword is present' |
| 521 | 520 | ), |
| 522 | 521 | 'pst' => array( |
| 523 | 522 | 'Do a pre-save transform on the input before parsing it', |
| Property changes on: branches/wmf/1.17wmf1/includes/api/ApiParse.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 524 | 523 | Merged /trunk/phase3/includes/api/ApiParse.php:r87423,88118,88124,88211,88498,89099,89401,89451 |
| Index: branches/wmf/1.17wmf1/includes/specials/SpecialUserlogin.php |
| — | — | @@ -148,7 +148,7 @@ |
| 149 | 149 | global $wgOut; |
| 150 | 150 | |
| 151 | 151 | if ( $this->mEmail == '' ) { |
| 152 | | - $this->mainLoginForm( wfMsgExt( 'noemail', array( 'parsemag', 'escape' ), $this->mName ) ); |
| | 152 | + $this->mainLoginForm( wfMsgExt( 'noemailcreate', array( 'parsemag', 'escape' ), $this->mName ) ); |
| 153 | 153 | return; |
| 154 | 154 | } |
| 155 | 155 | |
| Index: branches/wmf/1.17wmf1/includes/specials/SpecialVersion.php |
| — | — | @@ -103,6 +103,7 @@ |
| 104 | 104 | 'Aryeh Gregor', 'Aaron Schulz', 'Andrew Garrett', 'Raimond Spekking', |
| 105 | 105 | 'Alexandre Emsenhuber', 'Siebrand Mazeland', 'Chad Horohoe', |
| 106 | 106 | 'Roan Kattouw', 'Trevor Parscal', 'Bryan Tong Minh', 'Sam Reed', |
| | 107 | + 'Victor Vasiliev', 'Rotem Liss', 'Platonides', 'Ashar Voultoiz', |
| 107 | 108 | wfMsg( 'version-poweredby-others' ) |
| 108 | 109 | ); |
| 109 | 110 | |
| Property changes on: branches/wmf/1.17wmf1/includes/specials/SpecialVersion.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 110 | 111 | Merged /trunk/phase3/includes/specials/SpecialVersion.php:r87423,88118,88124,88211,88498,89099,89401,89451 |
| Index: branches/wmf/1.17wmf1/resources/Resources.php |
| — | — | @@ -77,6 +77,7 @@ |
| 78 | 78 | 'jquery.suggestions' => array( |
| 79 | 79 | 'scripts' => 'resources/jquery/jquery.suggestions.js', |
| 80 | 80 | 'styles' => 'resources/jquery/jquery.suggestions.css', |
| | 81 | + 'dependencies' => 'jquery.autoEllipsis', |
| 81 | 82 | ), |
| 82 | 83 | 'jquery.tabIndex' => array( |
| 83 | 84 | 'scripts' => 'resources/jquery/jquery.tabIndex.js' |
| Property changes on: branches/wmf/1.17wmf1/resources/Resources.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 84 | 85 | Merged /trunk/phase3/resources/Resources.php:r87423,88118,88124,88211,88498,89099,89401,89451 |