Index: trunk/phase3/skins/monobook/external.png |
Cannot display: file marked as a binary type. |
svn:mime-type = image/png |
Index: trunk/phase3/skins/monobook/external-ltr.png |
Cannot display: file marked as a binary type. |
svn:mime-type = image/png |
Property changes on: trunk/phase3/skins/monobook/external-ltr.png |
___________________________________________________________________ |
Added: svn:mime-type |
1 | 1 | + image/png |
Index: trunk/phase3/skins/monobook/main.css |
— | — | @@ -41,10 +41,13 @@ |
42 | 42 | |
43 | 43 | body { |
44 | 44 | font: x-small sans-serif; |
| 45 | + /* @embed */ |
45 | 46 | background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat; |
46 | 47 | color: black; |
47 | 48 | margin: 0; |
48 | 49 | padding: 0; |
| 50 | + direction: ltr; /* Needed for RTL flipping */ |
| 51 | + unicode-bidi: embed; |
49 | 52 | } |
50 | 53 | |
51 | 54 | /* scale back up to a sane default */ |
— | — | @@ -143,6 +146,7 @@ |
144 | 147 | list-style-type: square; |
145 | 148 | margin: .3em 0 0 1.5em; |
146 | 149 | padding: 0; |
| 150 | + /* @embed */ |
147 | 151 | list-style-image: url(bullet.gif); |
148 | 152 | } |
149 | 153 | ol { |
— | — | @@ -376,6 +380,7 @@ |
377 | 381 | } |
378 | 382 | |
379 | 383 | /* images */ |
| 384 | +/* @noflip */ |
380 | 385 | div.floatright, table.floatright { |
381 | 386 | clear: right; |
382 | 387 | float: right; |
— | — | @@ -388,6 +393,7 @@ |
389 | 394 | */ |
390 | 395 | } |
391 | 396 | div.floatright p { font-style: italic; } |
| 397 | +/* @noflip */ |
392 | 398 | div.floatleft, table.floatleft { |
393 | 399 | float: left; |
394 | 400 | clear: left; |
— | — | @@ -436,11 +442,13 @@ |
437 | 443 | border: none !important; |
438 | 444 | background: none !important; |
439 | 445 | } |
| 446 | +/* @noflip */ |
440 | 447 | div.tright { |
441 | 448 | clear: right; |
442 | 449 | float: right; |
443 | 450 | border-width: .5em 0 .8em 1.4em; |
444 | 451 | } |
| 452 | +/* @noflip */ |
445 | 453 | div.tleft { |
446 | 454 | float: left; |
447 | 455 | clear: left; |
— | — | @@ -492,36 +500,38 @@ |
493 | 501 | */ |
494 | 502 | #bodyContent a.external, |
495 | 503 | #bodyContent a.external[href ^="gopher://"] { |
496 | | - background: url(external.png) center right no-repeat; |
497 | | - padding: 0 13px; |
| 504 | + /* @embed */ |
| 505 | + background: url(external-ltr.png) center right no-repeat; |
| 506 | + padding-right: 13px; |
498 | 507 | } |
499 | | -.rtl #bodyContent a.external, |
500 | | -.rtl #bodyContent a.external[href ^="gopher://"] { |
501 | | - background-image: url(external-rtl.png); |
502 | | -} |
503 | 508 | #bodyContent a.external[href ^="https://"], |
504 | 509 | .link-https { |
| 510 | + /* @embed */ |
505 | 511 | background: url(lock_icon.gif) center right no-repeat; |
506 | | - padding: 0 16px; |
| 512 | + padding-right: 16px; |
507 | 513 | } |
508 | 514 | #bodyContent a.external[href ^="mailto:"], |
509 | 515 | .link-mailto { |
| 516 | + /* @embed */ |
510 | 517 | background: url(mail_icon.gif) center right no-repeat; |
511 | | - padding: 0 18px; |
| 518 | + padding-right: 18px; |
512 | 519 | } |
513 | 520 | #bodyContent a.external[href ^="news://"] { |
| 521 | + /* @embed */ |
514 | 522 | background: url(news_icon.png) center right no-repeat; |
515 | | - padding: 0 18px; |
| 523 | + padding-right: 18px; |
516 | 524 | } |
517 | 525 | #bodyContent a.external[href ^="ftp://"], |
518 | 526 | .link-ftp { |
| 527 | + /* @embed */ |
519 | 528 | background: url(file_icon.gif) center right no-repeat; |
520 | | - padding: 0 18px; |
| 529 | + padding-right: 18px; |
521 | 530 | } |
522 | 531 | #bodyContent a.external[href ^="irc://"], |
523 | 532 | .link-irc { |
| 533 | + /* @embed */ |
524 | 534 | background: url(discussionitem_icon.gif) center right no-repeat; |
525 | | - padding: 0 18px; |
| 535 | + padding-right: 18px; |
526 | 536 | } |
527 | 537 | #bodyContent a.external[href $=".ogg"], #bodyContent a.external[href $=".OGG"], |
528 | 538 | #bodyContent a.external[href $=".mid"], #bodyContent a.external[href $=".MID"], |
— | — | @@ -530,41 +540,28 @@ |
531 | 541 | #bodyContent a.external[href $=".wav"], #bodyContent a.external[href $=".WAV"], |
532 | 542 | #bodyContent a.external[href $=".wma"], #bodyContent a.external[href $=".WMA"], |
533 | 543 | .link-audio { |
| 544 | + /* @embed */ |
534 | 545 | background: url("audio.png") center right no-repeat; |
535 | | - padding: 0 13px; |
| 546 | + padding-right: 13px; |
536 | 547 | } |
537 | 548 | #bodyContent a.external[href $=".ogm"], #bodyContent a.external[href $=".OGM"], |
538 | 549 | #bodyContent a.external[href $=".avi"], #bodyContent a.external[href $=".AVI"], |
539 | 550 | #bodyContent a.external[href $=".mpeg"], #bodyContent a.external[href $=".MPEG"], |
540 | 551 | #bodyContent a.external[href $=".mpg"], #bodyContent a.external[href $=".MPG"], |
541 | 552 | .link-video { |
| 553 | + /* @embed */ |
542 | 554 | background: url("video.png") center right no-repeat; |
543 | | - padding: 0 13px; |
| 555 | + padding-right: 13px; |
544 | 556 | } |
545 | 557 | #bodyContent a.external[href $=".pdf"], #bodyContent a.external[href $=".PDF"], |
546 | 558 | #bodyContent a.external[href *=".pdf#"], #bodyContent a.external[href *=".PDF#"], |
547 | 559 | #bodyContent a.external[href *=".pdf?"], #bodyContent a.external[href *=".PDF?"], |
548 | 560 | .link-document { |
| 561 | + /* @embed */ |
549 | 562 | background: url("document.png") center right no-repeat; |
550 | | - padding: 0 12px; |
| 563 | + padding-right: 12px; |
551 | 564 | } |
552 | 565 | |
553 | | -/* for rtl wikis */ |
554 | | -.rtl #bodyContent a.external { |
555 | | - background-position: left; |
556 | | - padding-right: 0; |
557 | | -} |
558 | | -.rtl a.feedlink { |
559 | | - background-position: right; |
560 | | - padding-right: 16px; |
561 | | - padding-left: 0; |
562 | | -} |
563 | | - |
564 | | -/* correction for ltr wikis */ |
565 | | -.ltr #bodyContent a.external { |
566 | | - padding-left: 0; |
567 | | -} |
568 | | - |
569 | 566 | /* disable interwiki styling */ |
570 | 567 | #bodyContent a.extiw, |
571 | 568 | #bodyContent a.extiw:active { |
— | — | @@ -588,6 +585,15 @@ |
589 | 586 | width: 11.6em; |
590 | 587 | overflow: hidden; |
591 | 588 | } |
| 589 | +html > body .portlet { |
| 590 | + float: left; |
| 591 | + clear: left; |
| 592 | +} |
| 593 | +/* recover IEMac (might be fine with the float, but usually it's close to IE */ |
| 594 | +*>body .portlet { |
| 595 | + float: none; |
| 596 | + clear: none; |
| 597 | +} |
592 | 598 | .portlet h4 { |
593 | 599 | font-size: 95%; |
594 | 600 | font-weight: normal; |
— | — | @@ -633,6 +639,7 @@ |
634 | 640 | .portlet ul { |
635 | 641 | line-height: 1.5em; |
636 | 642 | list-style-type: square; |
| 643 | + /* @embed */ |
637 | 644 | list-style-image: url(bullet.gif); |
638 | 645 | font-size: 95%; |
639 | 646 | } |
— | — | @@ -769,6 +776,7 @@ |
770 | 777 | li#pt-userpage, |
771 | 778 | li#pt-anonuserpage, |
772 | 779 | li#pt-login { |
| 780 | + /* @embed */ |
773 | 781 | background: url(user.gif) top left no-repeat; |
774 | 782 | padding-left: 20px; |
775 | 783 | text-transform: none; |
— | — | @@ -1023,10 +1031,6 @@ |
1024 | 1032 | background-color: #f9f9f9; |
1025 | 1033 | float: left; |
1026 | 1034 | } |
1027 | | -.rtl div#userloginForm form, |
1028 | | -.rtl div#userlogin form#userlogin2 { |
1029 | | - float: right; |
1030 | | -} |
1031 | 1035 | |
1032 | 1036 | div#userloginForm table, |
1033 | 1037 | div#userlogin form#userlogin2 table { |
Index: trunk/phase3/skins/MonoBook.php |
— | — | @@ -28,20 +28,17 @@ |
29 | 29 | |
30 | 30 | parent::setupSkinUserCss( $out ); |
31 | 31 | |
32 | | - // Append to the default screen common & print styles... |
33 | | - $out->addStyle( 'monobook/main.css', 'screen' ); |
34 | | - if( $wgHandheldStyle ) { |
35 | | - // Currently in testing... try 'chick/main.css' |
36 | | - $out->addStyle( $wgHandheldStyle, 'handheld' ); |
37 | | - } |
| 32 | + $out->addModuleStyles( 'monobook' ); |
| 33 | + |
| 34 | + // TODO: Migrate all of these |
| 35 | + //$out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' ); |
| 36 | + //$out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' ); |
| 37 | + //$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' ); |
| 38 | + //$out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' ); |
38 | 39 | |
39 | | - $out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' ); |
40 | | - $out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' ); |
41 | | - $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' ); |
42 | | - $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' ); |
| 40 | + // TODO: migrate |
| 41 | + //$out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); |
43 | 42 | |
44 | | - $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' ); |
45 | | - |
46 | 43 | } |
47 | 44 | } |
48 | 45 | |
Index: trunk/phase3/resources/Resources.php |
— | — | @@ -14,6 +14,14 @@ |
15 | 15 | 'vector' => new ResourceLoaderFileModule( |
16 | 16 | array( 'styles' => array( 'skins/vector/screen.css' => array( 'media' => 'screen' ) ) ) |
17 | 17 | ), |
| 18 | + 'monobook' => new ResourceLoaderFileModule( |
| 19 | + array( 'styles' => array( |
| 20 | + 'skins/monobook/main.css' => array( 'media' => 'screen' ), |
| 21 | + // Honor $wgHandheldStyle. This is kind of evil |
| 22 | + $GLOBALS['wgHandheldStyle'] => array( 'media' => 'handheld' ) |
| 23 | + ) |
| 24 | + ) |
| 25 | + ), |
18 | 26 | |
19 | 27 | /* jQuery */ |
20 | 28 | |