| Index: branches/wmf-deployment/skins/monobook/rtl.css |
| — | — | @@ -227,19 +227,6 @@ |
| 228 | 228 | text-align: right; |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | | -/** |
| 232 | | - * Lists: |
| 233 | | - * The following lines don't have a visible effect on non-Gecko browsers |
| 234 | | - * They fix a problem ith Gecko browsers rendering lists to the right of |
| 235 | | - * left-floated objects in an RTL layout. |
| 236 | | - */ |
| 237 | | -html > body div#bodyContent ul { |
| 238 | | - display: table; |
| 239 | | -} |
| 240 | | -html > body div#bodyContent ul#filetoc { |
| 241 | | - display: block; |
| 242 | | -} |
| 243 | | - |
| 244 | 231 | /* Special:Allpages styling */ |
| 245 | 232 | td.mw-allpages-nav, p.mw-allpages-nav, td.mw-allpages-alphaindexline { |
| 246 | 233 | text-align: left; |
| Index: branches/wmf-deployment/skins/monobook/main.css |
| — | — | @@ -1274,25 +1274,6 @@ |
| 1275 | 1275 | display: none; |
| 1276 | 1276 | } |
| 1277 | 1277 | |
| 1278 | | - |
| 1279 | | -/* filetoc */ |
| 1280 | | -ul#filetoc { |
| 1281 | | - text-align: center; |
| 1282 | | - border: 1px solid #aaaaaa; |
| 1283 | | - background-color: #f9f9f9; |
| 1284 | | - padding: 5px; |
| 1285 | | - font-size: 95%; |
| 1286 | | - margin-bottom: 0.5em; |
| 1287 | | - margin-left: 0; |
| 1288 | | - margin-right: 0; |
| 1289 | | -} |
| 1290 | | - |
| 1291 | | -#filetoc li { |
| 1292 | | - display: inline; |
| 1293 | | - list-style-type: none; |
| 1294 | | - padding-right: 2em; |
| 1295 | | -} |
| 1296 | | - |
| 1297 | 1278 | input#wpSummary { |
| 1298 | 1279 | width: 80%; |
| 1299 | 1280 | } |
| — | — | @@ -1330,13 +1311,6 @@ |
| 1331 | 1312 | font-weight:bold; |
| 1332 | 1313 | } |
| 1333 | 1314 | |
| 1334 | | -#mw_trackbacks { |
| 1335 | | - border: solid 1px #bbbbff; |
| 1336 | | - background-color: #eeeeff; |
| 1337 | | - padding: 0.2em; |
| 1338 | | -} |
| 1339 | | - |
| 1340 | | - |
| 1341 | 1315 | /* Allmessages table */ |
| 1342 | 1316 | |
| 1343 | 1317 | #allmessagestable th { |
| — | — | @@ -1419,31 +1393,6 @@ |
| 1420 | 1394 | text-align: center; |
| 1421 | 1395 | } |
| 1422 | 1396 | |
| 1423 | | - |
| 1424 | | -/* |
| 1425 | | - Table pager (e.g. Special:Imagelist) |
| 1426 | | - - remove underlines from the navigation link |
| 1427 | | - - collapse borders |
| 1428 | | - - set the borders to outsets (similar to Special:Allmessages) |
| 1429 | | - - remove line wrapping for all td and th, set background color |
| 1430 | | - - restore line wrapping for the last two table cells (description and size) |
| 1431 | | -*/ |
| 1432 | | -.TablePager { min-width: 80%; } |
| 1433 | | -.TablePager_nav a { text-decoration: none; } |
| 1434 | | -.TablePager { border-collapse: collapse; } |
| 1435 | | -.TablePager, .TablePager td, .TablePager th { |
| 1436 | | - border: 1px solid #aaaaaa; |
| 1437 | | - padding: 0 0.15em 0 0.15em; |
| 1438 | | -} |
| 1439 | | -.TablePager th { background-color: #eeeeff } |
| 1440 | | -.TablePager td { background-color: #ffffff } |
| 1441 | | -.TablePager tr:hover td { background-color: #eeeeff } |
| 1442 | | - |
| 1443 | | -.imagelist td, .imagelist th { white-space: nowrap } |
| 1444 | | -.imagelist .TablePager_col_links { background-color: #eeeeff } |
| 1445 | | -.imagelist .TablePager_col_img_description { white-space: normal } |
| 1446 | | -.imagelist th.TablePager_sort { background-color: #ccccff } |
| 1447 | | - |
| 1448 | 1397 | .templatesUsed { margin-top: 1.5em; } |
| 1449 | 1398 | |
| 1450 | 1399 | .mw-summary-preview { |
| Index: branches/wmf-deployment/skins/modern/main.css |
| — | — | @@ -788,25 +788,6 @@ |
| 789 | 789 | display: none; |
| 790 | 790 | } |
| 791 | 791 | |
| 792 | | - |
| 793 | | -/* filetoc */ |
| 794 | | -ul#filetoc { |
| 795 | | - text-align: center; |
| 796 | | - border: 1px solid #aaaaaa; |
| 797 | | - background-color: #f9f9f9; |
| 798 | | - padding: 5px; |
| 799 | | - font-size: 95%; |
| 800 | | - margin-bottom: 0.5em; |
| 801 | | - margin-left: 0; |
| 802 | | - margin-right: 0; |
| 803 | | -} |
| 804 | | - |
| 805 | | -#filetoc li { |
| 806 | | - display: inline; |
| 807 | | - list-style-type: none; |
| 808 | | - padding-right: 2em; |
| 809 | | -} |
| 810 | | - |
| 811 | 792 | input#wpSummary { |
| 812 | 793 | width: 80%; |
| 813 | 794 | } |
| — | — | @@ -844,13 +825,6 @@ |
| 845 | 826 | font-weight:bold; |
| 846 | 827 | } |
| 847 | 828 | |
| 848 | | -#mw_trackbacks { |
| 849 | | - border: solid 1px #bbbbff; |
| 850 | | - background-color: #eeeeff; |
| 851 | | - padding: 0.2em; |
| 852 | | -} |
| 853 | | - |
| 854 | | - |
| 855 | 829 | /* Allmessages table */ |
| 856 | 830 | |
| 857 | 831 | #allmessagestable th { |
| Index: branches/wmf-deployment/skins/common/common_rtl.css |
| — | — | @@ -52,3 +52,13 @@ |
| 53 | 53 | background: none !important; |
| 54 | 54 | padding-left: 0 !important; |
| 55 | 55 | } |
| | 56 | + |
| | 57 | +/** |
| | 58 | + * Lists: |
| | 59 | + * The following lines don't have a visible effect on non-Gecko browsers |
| | 60 | + * They fix a problem ith Gecko browsers rendering lists to the right of |
| | 61 | + * left-floated objects in an RTL layout. |
| | 62 | + */ |
| | 63 | +html > body div#bodyContent ul#filetoc { |
| | 64 | + display: block; |
| | 65 | +} |
| Index: branches/wmf-deployment/skins/common/oldshared.css |
| — | — | @@ -319,12 +319,6 @@ |
| 320 | 320 | clear: both; |
| 321 | 321 | } |
| 322 | 322 | |
| 323 | | -#mw_trackbacks { |
| 324 | | - border: solid 1px #bbbbff; |
| 325 | | - background-color: #eeeeff; |
| 326 | | - padding: 0.2em; |
| 327 | | -} |
| 328 | | - |
| 329 | 323 | /* Allmessages table */ |
| 330 | 324 | |
| 331 | 325 | #allmessagestable th { |
| Index: branches/wmf-deployment/skins/common/shared.css |
| — | — | @@ -67,7 +67,9 @@ |
| 68 | 68 | body.rtl td.mw-input { text-align: right; } |
| 69 | 69 | body.rtl td.mw-submit { text-align: right; } |
| 70 | 70 | |
| 71 | | -td.mw-label { vertical-align: top; width: 30%; } |
| | 71 | +td.mw-label { vertical-align: top; } |
| | 72 | +.prefsection td.mw-label { width: 20%; } |
| | 73 | +.prefsection table { width: 100%; } |
| 72 | 74 | td.mw-submit { white-space: nowrap; } |
| 73 | 75 | |
| 74 | 76 | table.mw-htmlform-nolabel td.mw-label { width: 0 !important; } |
| — | — | @@ -136,25 +138,25 @@ |
| 137 | 139 | float:left; |
| 138 | 140 | padding-left: 0.25em; |
| 139 | 141 | } |
| 140 | | -.mw-search-formheader div.search-types > ul { |
| | 142 | +.mw-search-formheader div.search-types ul { |
| 141 | 143 | margin: 0 !important; |
| 142 | 144 | padding: 0 !important; |
| 143 | 145 | list-style: none !important; |
| 144 | 146 | } |
| 145 | | -.mw-search-formheader div.search-types > ul > li { |
| | 147 | +.mw-search-formheader div.search-types ul li { |
| 146 | 148 | float: left; |
| 147 | 149 | margin: 0; |
| 148 | 150 | padding: 0; |
| 149 | 151 | } |
| 150 | | -.mw-search-formheader div.search-types > ul > li > a { |
| | 152 | +.mw-search-formheader div.search-types ul li a { |
| 151 | 153 | display: block; |
| 152 | 154 | padding: 0.5em; |
| 153 | 155 | } |
| 154 | | -.mw-search-formheader div.search-types > ul > li.current > a { |
| | 156 | +.mw-search-formheader div.search-types ul li.current a { |
| 155 | 157 | color: #333333; |
| 156 | 158 | cursor: default; |
| 157 | 159 | } |
| 158 | | -.mw-search-formheader div.search-types > ul > li.current > a:hover { |
| | 160 | +.mw-search-formheader div.search-types ul li.current a:hover { |
| 159 | 161 | text-decoration: none; |
| 160 | 162 | } |
| 161 | 163 | .mw-search-formheader div.results-info { |
| — | — | @@ -162,12 +164,12 @@ |
| 163 | 165 | padding: 0.5em; |
| 164 | 166 | padding-right: 0.75em; |
| 165 | 167 | } |
| 166 | | -.mw-search-formheader div.results-info > ul { |
| | 168 | +.mw-search-formheader div.results-info ul { |
| 167 | 169 | margin: 0 !important; |
| 168 | 170 | padding: 0 !important; |
| 169 | 171 | list-style: none !important; |
| 170 | 172 | } |
| 171 | | -.mw-search-formheader div.results-info > ul > li { |
| | 173 | +.mw-search-formheader div.results-info ul li { |
| 172 | 174 | float: right; |
| 173 | 175 | margin: 0; |
| 174 | 176 | padding: 0; |
| — | — | @@ -181,33 +183,33 @@ |
| 182 | 184 | border: none; |
| 183 | 185 | background-color: #f9f9f9; |
| 184 | 186 | border: 1px solid silver !important; |
| 185 | | - border-top: none !important; |
| | 187 | + border-top-width: 0 !important; |
| 186 | 188 | } |
| 187 | | -fieldset#mw-searchoptions > legend { |
| | 189 | +fieldset#mw-searchoptions legend { |
| 188 | 190 | display: none; |
| 189 | 191 | } |
| 190 | | -fieldset#mw-searchoptions > h4 { |
| | 192 | +fieldset#mw-searchoptions h4 { |
| 191 | 193 | padding: 0; |
| 192 | 194 | margin: 0; |
| 193 | 195 | float: left; |
| 194 | 196 | } |
| 195 | | -fieldset#mw-searchoptions > div#mw-search-togglebox { |
| | 197 | +fieldset#mw-searchoptions div#mw-search-togglebox { |
| 196 | 198 | float: right; |
| 197 | 199 | } |
| 198 | | -fieldset#mw-searchoptions > div#mw-search-togglebox > label { |
| | 200 | +fieldset#mw-searchoptions div#mw-search-togglebox label { |
| 199 | 201 | margin-right: 0.25em; |
| 200 | 202 | } |
| 201 | | -fieldset#mw-searchoptions > div#mw-search-togglebox > input { |
| | 203 | +fieldset#mw-searchoptions div#mw-search-togglebox input { |
| 202 | 204 | margin-left: 0.25em; |
| 203 | 205 | } |
| 204 | | -fieldset#mw-searchoptions > table { |
| | 206 | +fieldset#mw-searchoptions table { |
| 205 | 207 | float: left; |
| 206 | 208 | margin-right: 3em; |
| 207 | 209 | } |
| 208 | | -fieldset#mw-searchoptions > table td { |
| | 210 | +fieldset#mw-searchoptions table td { |
| 209 | 211 | padding-right: 1em; |
| 210 | 212 | } |
| 211 | | -body.rtl fieldset#mw-searchoptions > table { |
| | 213 | +body.rtl fieldset#mw-searchoptions table { |
| 212 | 214 | float: right; |
| 213 | 215 | } |
| 214 | 216 | fieldset#mw-searchoptions div.divider { |
| — | — | @@ -550,3 +552,51 @@ |
| 551 | 553 | .visualClear { |
| 552 | 554 | clear: both; |
| 553 | 555 | } |
| | 556 | + |
| | 557 | +#mw_trackbacks { |
| | 558 | + border: solid 1px #bbbbff; |
| | 559 | + background-color: #eeeeff; |
| | 560 | + padding: 0.2em; |
| | 561 | +} |
| | 562 | + |
| | 563 | +/* |
| | 564 | + Table pager (e.g. Special:Imagelist) |
| | 565 | + - remove underlines from the navigation link |
| | 566 | + - collapse borders |
| | 567 | + - set the borders to outsets (similar to Special:Allmessages) |
| | 568 | + - remove line wrapping for all td and th, set background color |
| | 569 | + - restore line wrapping for the last two table cells (description and size) |
| | 570 | +*/ |
| | 571 | +.TablePager { min-width: 80%; } |
| | 572 | +.TablePager_nav a { text-decoration: none; } |
| | 573 | +.TablePager { border-collapse: collapse; } |
| | 574 | +.TablePager, .TablePager td, .TablePager th { |
| | 575 | + border: 1px solid #aaaaaa; |
| | 576 | + padding: 0 0.15em 0 0.15em; |
| | 577 | +} |
| | 578 | +.TablePager th { background-color: #eeeeff } |
| | 579 | +.TablePager td { background-color: #ffffff } |
| | 580 | +.TablePager tr:hover td { background-color: #eeeeff } |
| | 581 | + |
| | 582 | +.imagelist td, .imagelist th { white-space: nowrap } |
| | 583 | +.imagelist .TablePager_col_links { background-color: #eeeeff } |
| | 584 | +.imagelist .TablePager_col_img_description { white-space: normal } |
| | 585 | +.imagelist th.TablePager_sort { background-color: #ccccff } |
| | 586 | + |
| | 587 | +/* filetoc */ |
| | 588 | +ul#filetoc { |
| | 589 | + text-align: center; |
| | 590 | + border: 1px solid #aaaaaa; |
| | 591 | + background-color: #f9f9f9; |
| | 592 | + padding: 5px; |
| | 593 | + font-size: 95%; |
| | 594 | + margin-bottom: 0.5em; |
| | 595 | + margin-left: 0; |
| | 596 | + margin-right: 0; |
| | 597 | +} |
| | 598 | + |
| | 599 | +#filetoc li { |
| | 600 | + display: inline; |
| | 601 | + list-style-type: none; |
| | 602 | + padding-right: 2em; |
| | 603 | +} |
| \ No newline at end of file |
| Index: branches/wmf-deployment/skins/Vector.php |
| — | — | @@ -79,21 +79,21 @@ |
| 80 | 80 | $isTalk = $this->mTitle->isTalkPage(); |
| 81 | 81 | |
| 82 | 82 | // Generates XML IDs from namespace names |
| 83 | | - $subjectId = $wgContLang->lc( $this->mTitle->getSubjectNsText() ); |
| 84 | | - if ( $subjectId == '' ) { |
| 85 | | - $subjectId = 'main'; |
| 86 | | - } |
| | 83 | + $subjectId = $this->mTitle->getNamespaceKey( '' ); |
| | 84 | + |
| 87 | 85 | $talkId = "{$subjectId}_talk"; |
| 88 | 86 | $currentId = $isTalk ? $talkId : $subjectId; |
| 89 | | - |
| | 87 | + |
| 90 | 88 | // Adds namespace links |
| 91 | 89 | $links['namespaces'][$subjectId] = $this->tabAction( |
| 92 | 90 | $subjectPage, 'vector-namespace-' . $subjectId, !$isTalk, '', true |
| 93 | 91 | ); |
| | 92 | + $links['namespaces'][$subjectId]['context'] = 'subject'; |
| 94 | 93 | $links['namespaces'][$talkId] = $this->tabAction( |
| 95 | 94 | $talkPage, 'vector-namespace-talk', $isTalk, '', true |
| 96 | 95 | ); |
| 97 | | - |
| | 96 | + $links['namespaces'][$talkId]['context'] = 'talk'; |
| | 97 | + |
| 98 | 98 | // Adds view view link |
| 99 | 99 | if ( $this->mTitle->exists() ) { |
| 100 | 100 | $links['views']['view'] = $this->tabAction( |
| — | — | @@ -292,7 +292,10 @@ |
| 293 | 293 | ); |
| 294 | 294 | } |
| 295 | 295 | } |
| 296 | | - |
| | 296 | + |
| | 297 | + // This is instead of SkinTemplateTabs - which uses a flat array |
| | 298 | + wfRunHooks( 'SkinTemplateNavigation', array( &$this, &$links ) ); |
| | 299 | + |
| 297 | 300 | // If it's not content, it's got to be a special page |
| 298 | 301 | } else { |
| 299 | 302 | $links['namespaces']['special'] = array( |
| — | — | @@ -366,8 +369,12 @@ |
| 367 | 370 | $nav = $this->skin->buildNavigationUrls(); |
| 368 | 371 | foreach ( $nav as $section => $links ) { |
| 369 | 372 | foreach ( $links as $key => $link ) { |
| | 373 | + $insert = ''; |
| | 374 | + if ( isset( $link['context'] ) && $link['context'] == 'subject' ) { |
| | 375 | + $insert = 'nstab-'; |
| | 376 | + } |
| 370 | 377 | $nav[$section][$key]['attributes'] = |
| 371 | | - ' id="' . Sanitizer::escapeId( "ca-$key" ) . '"'; |
| | 378 | + ' id="' . Sanitizer::escapeId( "ca-{$insert}{$key}" ) . '"'; |
| 372 | 379 | if ( $nav[$section][$key]['class'] ) { |
| 373 | 380 | $nav[$section][$key]['attributes'] .= |
| 374 | 381 | ' class="' . htmlspecialchars( $link['class'] ) . '"'; |
| — | — | @@ -382,10 +389,10 @@ |
| 383 | 390 | in_array( $key, array( 'edit', 'watch', 'unwatch' ) ) |
| 384 | 391 | ) { |
| 385 | 392 | $nav[$section][$key]['key'] = |
| 386 | | - $this->skin->tooltip( "ca-$key" ); |
| | 393 | + $this->skin->tooltip( "ca-{$insert}{$key}" ); |
| 387 | 394 | } else { |
| 388 | 395 | $nav[$section][$key]['key'] = |
| 389 | | - $this->skin->tooltipAndAccesskey( "ca-$key" ); |
| | 396 | + $this->skin->tooltipAndAccesskey( "ca-{$insert}{$key}" ); |
| 390 | 397 | } |
| 391 | 398 | } |
| 392 | 399 | } |
| — | — | @@ -546,7 +553,7 @@ |
| 547 | 554 | <!-- header --> |
| 548 | 555 | <div id="head" class="noprint"> |
| 549 | 556 | <!-- personal --> |
| 550 | | - <div id="personal"> |
| | 557 | + <div id="p-personal"> |
| 551 | 558 | <h5><?php $this->msg('personaltools') ?></h5> |
| 552 | 559 | <ul <?php $this->html('userlangattributes') ?>> |
| 553 | 560 | <?php foreach($this->data['personal_urls'] as $key => $item): ?> |
| Property changes on: branches/wmf-deployment/skins/Vector.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 554 | 561 | - /branches/REL1_15/phase3/skins/Vector.php:51646 |
| /trunk/phase3/skins/Vector.php:52089-52665,53369 |
| 555 | 562 | + /branches/REL1_15/phase3/skins/Vector.php:51646 |
| /trunk/phase3/skins/Vector.php:52089-52665,52718,52737,52759,52776,52791,52800,52808,52812-52813,53369 |
| Index: branches/wmf-deployment/skins/vector/images/bullet-icon.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Index: branches/wmf-deployment/skins/vector/main-ltr.css |
| — | — | @@ -52,20 +52,21 @@ |
| 53 | 53 | padding: 0; |
| 54 | 54 | } |
| 55 | 55 | /* Personal */ |
| 56 | | - div#personal { |
| | 56 | + div#p-personal { |
| 57 | 57 | position: absolute; |
| 58 | 58 | top: 0; |
| 59 | 59 | right: 0.75em; |
| 60 | 60 | } |
| 61 | | - div#personal h5 { |
| | 61 | + div#p-personal h5 { |
| 62 | 62 | display: none; |
| 63 | 63 | } |
| 64 | | - div#personal li { |
| | 64 | + div#p-personal li { |
| 65 | 65 | float: left; |
| 66 | 66 | margin-left: 0.75em; |
| 67 | 67 | margin-top: 0.5em; |
| 68 | 68 | font-size: 0.9em; |
| 69 | 69 | } |
| | 70 | + /* Navigation Containers */ |
| 70 | 71 | div#left-navigation { |
| 71 | 72 | position: absolute; |
| 72 | 73 | left: 12em; |
| — | — | @@ -77,7 +78,7 @@ |
| 78 | 79 | } |
| 79 | 80 | /* Navigation Labels */ |
| 80 | 81 | div#namespaces h5, |
| 81 | | - div#variants h5, |
| | 82 | + div#variants h5 span, |
| 82 | 83 | div#views h5, |
| 83 | 84 | div#actions h5 span, |
| 84 | 85 | div#search h5 { |
| — | — | @@ -243,6 +244,7 @@ |
| 244 | 245 | padding-left: 1.25em; |
| 245 | 246 | cursor: default; |
| 246 | 247 | border: none; |
| | 248 | + font-size: 0.9em; |
| 247 | 249 | } |
| 248 | 250 | div#panel div.portal div.body { |
| 249 | 251 | margin: 0; |
| — | — | @@ -262,6 +264,7 @@ |
| 263 | 265 | padding-bottom: 0.5em; |
| 264 | 266 | margin: 0; |
| 265 | 267 | overflow: hidden; |
| | 268 | + font-size: 0.9em; |
| 266 | 269 | } |
| 267 | 270 | div#panel div.portal div.body ul li a { |
| 268 | 271 | color: #0645ad; |
| — | — | @@ -880,4 +883,9 @@ |
| 881 | 884 | background: url(images/user-icon.png) left top no-repeat; |
| 882 | 885 | padding-left: 15px !important; |
| 883 | 886 | text-transform: none; |
| 884 | | -} |
| \ No newline at end of file |
| | 887 | +} |
| | 888 | + |
| | 889 | +span.newpage, span.minor, span.bot { |
| | 890 | + font-weight: bold; |
| | 891 | +} |
| | 892 | + |
| Index: branches/wmf-deployment/skins/vector/main-rtl.css |
| — | — | @@ -65,20 +65,21 @@ |
| 66 | 66 | padding: 0; |
| 67 | 67 | } |
| 68 | 68 | /* Personal */ |
| 69 | | - div#personal { |
| | 69 | + div#p-personal { |
| 70 | 70 | position: absolute; |
| 71 | 71 | top: 0; |
| 72 | 72 | left: 0.75em; |
| 73 | 73 | } |
| 74 | | - div#personal h5 { |
| | 74 | + div#p-personal h5 { |
| 75 | 75 | display: none; |
| 76 | 76 | } |
| 77 | | - div#personal li { |
| | 77 | + div#p-personal li { |
| 78 | 78 | float: right; |
| 79 | 79 | margin-right: 0.75em; |
| 80 | 80 | margin-top: 0.5em; |
| 81 | 81 | font-size: 0.9em; |
| 82 | 82 | } |
| | 83 | + /* Navigation Containers */ |
| 83 | 84 | div#left-navigation { |
| 84 | 85 | position: absolute; |
| 85 | 86 | right: 12em; |
| — | — | @@ -90,7 +91,7 @@ |
| 91 | 92 | } |
| 92 | 93 | /* Navigation Labels */ |
| 93 | 94 | div#namespaces h5, |
| 94 | | - div#variants h5, |
| | 95 | + div#variants h5 span, |
| 95 | 96 | div#views h5, |
| 96 | 97 | div#actions h5 span, |
| 97 | 98 | div#search h5 { |
| — | — | @@ -264,6 +265,7 @@ |
| 265 | 266 | background-image: url(images/portal-break-rtl.png); |
| 266 | 267 | background-repeat: no-repeat; |
| 267 | 268 | background-position: top right; |
| | 269 | + font-size: 0.9em; |
| 268 | 270 | } |
| 269 | 271 | div#panel div.portal div.body ul { |
| 270 | 272 | list-style: none; |
| — | — | @@ -275,6 +277,7 @@ |
| 276 | 278 | padding-bottom: 0.5em; |
| 277 | 279 | margin: 0; |
| 278 | 280 | overflow: hidden; |
| | 281 | + font-size: 0.9em; |
| 279 | 282 | } |
| 280 | 283 | div#panel div.portal div.body ul li a { |
| 281 | 284 | color: #0645ad; |
| — | — | @@ -892,4 +895,9 @@ |
| 893 | 896 | background: url(images/user-icon.png) right top no-repeat; |
| 894 | 897 | padding-right: 15px !important; |
| 895 | 898 | text-transform: none; |
| 896 | | -} |
| \ No newline at end of file |
| | 899 | +} |
| | 900 | + |
| | 901 | +span.newpage, span.minor, span.bot { |
| | 902 | + font-weight: bold; |
| | 903 | +} |
| | 904 | + |
| Property changes on: branches/wmf-deployment/skins/vector/main-rtl.css |
| ___________________________________________________________________ |
| Name: svn:eol-style |
| 897 | 905 | + native |
| Property changes on: branches/wmf-deployment/skins/vector |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 898 | 906 | - /branches/REL1_15/phase3/skins/vector:51646 |
| /trunk/phase3/skins/vector:52089-52665,53369 |
| 899 | 907 | + /branches/REL1_15/phase3/skins/vector:51646 |
| /trunk/phase3/skins/vector:52089-52665,52718,52737,52759,52776,52791,52800,52808,52812-52813,53369 |
| Property changes on: branches/wmf-deployment/extensions |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 900 | 908 | - /branches/REL1_15/phase3/extensions:51646 |
| /trunk/extensions:53272 |
| /trunk/phase3:53272 |
| /trunk/phase3/extensions:53369 |
| 901 | 909 | + /branches/REL1_15/phase3/extensions:51646 |
| /trunk/extensions:53272 |
| /trunk/phase3:53272 |
| /trunk/phase3/extensions:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,53369 |
| Index: branches/wmf-deployment/includes/Title.php |
| — | — | @@ -3502,40 +3502,29 @@ |
| 3503 | 3503 | * Generate strings used for xml 'id' names in monobook tabs |
| 3504 | 3504 | * @return \type{\string} XML 'id' name |
| 3505 | 3505 | */ |
| 3506 | | - public function getNamespaceKey() { |
| 3507 | | - global $wgContLang; |
| 3508 | | - switch ($this->getNamespace()) { |
| 3509 | | - case NS_MAIN: |
| 3510 | | - case NS_TALK: |
| 3511 | | - return 'nstab-main'; |
| 3512 | | - case NS_USER: |
| 3513 | | - case NS_USER_TALK: |
| 3514 | | - return 'nstab-user'; |
| 3515 | | - case NS_MEDIA: |
| 3516 | | - return 'nstab-media'; |
| 3517 | | - case NS_SPECIAL: |
| 3518 | | - return 'nstab-special'; |
| 3519 | | - case NS_PROJECT: |
| 3520 | | - case NS_PROJECT_TALK: |
| 3521 | | - return 'nstab-project'; |
| 3522 | | - case NS_FILE: |
| 3523 | | - case NS_FILE_TALK: |
| 3524 | | - return 'nstab-image'; |
| 3525 | | - case NS_MEDIAWIKI: |
| 3526 | | - case NS_MEDIAWIKI_TALK: |
| 3527 | | - return 'nstab-mediawiki'; |
| 3528 | | - case NS_TEMPLATE: |
| 3529 | | - case NS_TEMPLATE_TALK: |
| 3530 | | - return 'nstab-template'; |
| 3531 | | - case NS_HELP: |
| 3532 | | - case NS_HELP_TALK: |
| 3533 | | - return 'nstab-help'; |
| 3534 | | - case NS_CATEGORY: |
| 3535 | | - case NS_CATEGORY_TALK: |
| 3536 | | - return 'nstab-category'; |
| 3537 | | - default: |
| 3538 | | - return 'nstab-' . $wgContLang->lc( $this->getSubjectNsText() ); |
| | 3506 | + public function getNamespaceKey( $prepend = 'nstab-' ) { |
| | 3507 | + global $wgContLang, $wgCanonicalNamespaceNames; |
| | 3508 | + // Gets the subject namespace if this title |
| | 3509 | + $namespace = MWNamespace::getSubject( $this->getNamespace() ); |
| | 3510 | + // Checks if cononical namespace name exists for namespace |
| | 3511 | + if ( isset( $wgCanonicalNamespaceNames[$namespace] ) ) { |
| | 3512 | + // Uses canonical namespace name |
| | 3513 | + $namespaceKey = $wgCanonicalNamespaceNames[$namespace]; |
| | 3514 | + } else { |
| | 3515 | + // Uses text of namespace |
| | 3516 | + $namespaceKey = $this->getSubjectNsText(); |
| 3539 | 3517 | } |
| | 3518 | + // Makes namespace key lowercase |
| | 3519 | + $namespaceKey = $wgContLang->lc( $namespaceKey ); |
| | 3520 | + // Uses main |
| | 3521 | + if ( $namespaceKey == '' ) { |
| | 3522 | + $namespaceKey = 'main'; |
| | 3523 | + } |
| | 3524 | + // Changes file to image for backwards compatibility |
| | 3525 | + if ( $namespaceKey == 'file' ) { |
| | 3526 | + $namespaceKey = 'image'; |
| | 3527 | + } |
| | 3528 | + return $prepend . $namespaceKey; |
| 3540 | 3529 | } |
| 3541 | 3530 | |
| 3542 | 3531 | /** |
| Property changes on: branches/wmf-deployment/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3543 | 3532 | - /trunk/phase3/includes/ConfEditor.php:53369 |
| 3544 | 3533 | + /trunk/phase3/includes/ConfEditor.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,53369 |
| Property changes on: branches/wmf-deployment/includes/specials/SpecialUserrights.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3545 | 3534 | - /trunk/phase3/includes/specials/SpecialUserrights.php:36354-52116,53369 |
| 3546 | 3535 | + /trunk/phase3/includes/specials/SpecialUserrights.php:36354-52116,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,53369 |
| Property changes on: branches/wmf-deployment/includes/specials/SpecialSearch.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3547 | 3536 | - /trunk/phase3/includes/specials/SpecialSearch.php:36354-52665,53369 |
| 3548 | 3537 | + /trunk/phase3/includes/specials/SpecialSearch.php:36354-52665,52718,52737,52759,52776,52791,52800,52808,52812-52813,53369 |
| Property changes on: branches/wmf-deployment/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3549 | 3538 | - /trunk/phase3/includes/specials:36354-52088,53369 |
| 3550 | 3539 | + /trunk/phase3/includes/specials:36354-52088,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,53369 |
| Property changes on: branches/wmf-deployment/includes/Skin.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3551 | 3540 | - /branches/REL1_15/phase3/includes/Skin.php:51646 |
| /trunk/phase3/includes/Skin.php:52089-52361,53369 |
| 3552 | 3541 | + /branches/REL1_15/phase3/includes/Skin.php:51646 |
| /trunk/phase3/includes/Skin.php:52089-52361,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,53369 |
| Property changes on: branches/wmf-deployment |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3553 | 3542 | - /branches/REL1_15/phase3:51646 |
| /trunk/phase3:53369 |
| 3554 | 3543 | + /branches/REL1_15/phase3:51646 |
| /trunk/phase3:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,53369 |