| Index: trunk/phase3/skins/modern/main.css |
| — | — | @@ -8,6 +8,9 @@ |
| 9 | 9 | font-family: sans-serif; |
| 10 | 10 | color: black; |
| 11 | 11 | background-color: #f0f0f0; |
| | 12 | + |
| | 13 | + direction: ltr; |
| | 14 | + unicode-bidi: embed; |
| 12 | 15 | } |
| 13 | 16 | |
| 14 | 17 | #mw_main, |
| — | — | @@ -182,6 +185,7 @@ |
| 183 | 186 | } |
| 184 | 187 | |
| 185 | 188 | ul { |
| | 189 | + /* @embed */ |
| 186 | 190 | list-style-image: url(bullet.gif); |
| 187 | 191 | } |
| 188 | 192 | |
| — | — | @@ -245,6 +249,7 @@ |
| 246 | 250 | |
| 247 | 251 | #footer { |
| 248 | 252 | background-color: #f0f0f0; |
| | 253 | + /* @embed */ |
| 249 | 254 | background: url(footer-grad.png) repeat-x 0 0; |
| 250 | 255 | padding: 10px 1em 1em 1em; |
| 251 | 256 | clear:both; |
| — | — | @@ -407,31 +412,37 @@ |
| 408 | 413 | |
| 409 | 414 | #mw_content a.external, |
| 410 | 415 | #mw_content a[href ^="gopher://"] { |
| | 416 | + /* @embed */ |
| 411 | 417 | background: url(external.png) center right no-repeat; |
| 412 | 418 | padding-right: 13px; |
| 413 | 419 | } |
| 414 | 420 | #mw_content a[href ^="https://"], |
| 415 | 421 | .link-https { |
| | 422 | + /* @embed */ |
| 416 | 423 | background: url(lock_icon.gif) center right no-repeat; |
| 417 | 424 | padding-right: 16px; |
| 418 | 425 | } |
| 419 | 426 | #mw_content a[href ^="mailto:"], |
| 420 | 427 | .link-mailto { |
| | 428 | + /* @embed */ |
| 421 | 429 | background: url(mail_icon.gif) center right no-repeat; |
| 422 | 430 | padding-right: 18px; |
| 423 | 431 | } |
| 424 | 432 | #mw_content a[href ^="news://"] { |
| | 433 | + /* @embed */ |
| 425 | 434 | background: url(news_icon.png) center right no-repeat; |
| 426 | 435 | padding-right: 18px; |
| 427 | 436 | } |
| 428 | 437 | #mw_content a[href ^="ftp://"], |
| 429 | 438 | .link-ftp { |
| | 439 | + /* @embed */ |
| 430 | 440 | background: url(file_icon.gif) center right no-repeat; |
| 431 | 441 | padding-right: 18px; |
| 432 | 442 | } |
| 433 | 443 | #mw_content a[href ^="irc://"], |
| 434 | 444 | #mw_content a.extiw[href ^="irc://"], |
| 435 | 445 | .link-irc { |
| | 446 | + /* @embed */ |
| 436 | 447 | background: url(discussionitem_icon.gif) center right no-repeat; |
| 437 | 448 | padding-right: 18px; |
| 438 | 449 | } |
| — | — | @@ -443,6 +454,7 @@ |
| 444 | 455 | #mw_content a.external[href $=".wav"], #mw_content a.external[href $=".WAV"], |
| 445 | 456 | #mw_content a.external[href $=".wma"], #mw_content a.external[href $=".WMA"], |
| 446 | 457 | .link-audio { |
| | 458 | + /* @embed */ |
| 447 | 459 | background: url("audio.png") center right no-repeat; |
| 448 | 460 | padding-right: 13px; |
| 449 | 461 | } |
| — | — | @@ -451,6 +463,7 @@ |
| 452 | 464 | #mw_content a.external[href $=".mpeg"], #mw_content a.external[href $=".MPEG"], |
| 453 | 465 | #mw_content a.external[href $=".mpg"], #mw_content a.external[href $=".MPG"], |
| 454 | 466 | .link-video { |
| | 467 | + /* @embed */ |
| 455 | 468 | background: url("video.png") center right no-repeat; |
| 456 | 469 | padding-right: 13px; |
| 457 | 470 | } |
| — | — | @@ -458,11 +471,13 @@ |
| 459 | 472 | #mw_content a.external[href *=".pdf#"], #mw_content a.external[href *=".PDF#"], |
| 460 | 473 | #mw_content a.external[href *=".pdf?"], #mw_content a.external[href *=".PDF?"], |
| 461 | 474 | .link-document { |
| | 475 | + /* @embed */ |
| 462 | 476 | background: url("document.png") center right no-repeat; |
| 463 | 477 | padding-right: 12px; |
| 464 | 478 | } |
| 465 | 479 | |
| 466 | 480 | /* images */ |
| | 481 | +/* @noflip */ |
| 467 | 482 | div.floatright, table.floatright { |
| 468 | 483 | clear: right; |
| 469 | 484 | float: right; |
| — | — | @@ -475,6 +490,7 @@ |
| 476 | 491 | */ |
| 477 | 492 | } |
| 478 | 493 | div.floatright p { font-style: italic; } |
| | 494 | +/* @noflip */ |
| 479 | 495 | div.floatleft, table.floatleft { |
| 480 | 496 | float: left; |
| 481 | 497 | clear: left; |
| — | — | @@ -521,11 +537,13 @@ |
| 522 | 538 | border: none !important; |
| 523 | 539 | background: none !important; |
| 524 | 540 | } |
| | 541 | +/* @noflip */ |
| 525 | 542 | div.tright { |
| 526 | 543 | clear: right; |
| 527 | 544 | float: right; |
| 528 | 545 | margin: .5em 0 .8em 1.4em; |
| 529 | 546 | } |
| | 547 | +/* @noflip */ |
| 530 | 548 | div.tleft { |
| 531 | 549 | float: left; |
| 532 | 550 | clear: left; |
| — | — | @@ -793,6 +811,7 @@ |
| 794 | 812 | list-style-type: square; |
| 795 | 813 | margin: .3em 0 0 1.5em; |
| 796 | 814 | padding: 0; |
| | 815 | + /* @embed */ |
| 797 | 816 | list-style-image: url(bullet.gif); |
| 798 | 817 | } |
| 799 | 818 | ol { |
| — | — | @@ -836,6 +855,7 @@ |
| 837 | 856 | border-collapse: collapse; |
| 838 | 857 | margin: 0 -1em 1em -1em; |
| 839 | 858 | padding: 0 0 8px 0; |
| | 859 | + /* @embed */ |
| 840 | 860 | background: url(footer-grad.png) repeat-x bottom left; |
| 841 | 861 | } |
| 842 | 862 | |
| — | — | @@ -880,4 +900,4 @@ |
| 881 | 901 | /* Tooltips are outside of the normal body code, so this helps make the size of the text sensible */ |
| 882 | 902 | .tipsy { |
| 883 | 903 | font-size: 130%; |
| 884 | | -} |
| \ No newline at end of file |
| | 904 | +} |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -22,11 +22,8 @@ |
| 23 | 23 | $template = 'ModernTemplate', $useHeadElement = true; |
| 24 | 24 | |
| 25 | 25 | function setupSkinUserCss( OutputPage $out ){ |
| 26 | | - // Do not call parent::setupSkinUserCss(), we have our own print style |
| 27 | | - $out->addStyle( 'common/shared.css', 'screen' ); |
| 28 | | - $out->addStyle( 'modern/main.css', 'screen' ); |
| 29 | | - $out->addStyle( 'modern/print.css', 'print' ); |
| 30 | | - $out->addStyle( 'modern/rtl.css', 'screen', '', 'rtl' ); |
| | 26 | + parent::setupSkinUserCss( $out ); |
| | 27 | + $out->addModuleStyles ('skins.modern'); |
| 31 | 28 | } |
| 32 | 29 | } |
| 33 | 30 | |
| Index: trunk/phase3/resources/Resources.php |
| — | — | @@ -27,6 +27,10 @@ |
| 28 | 28 | 'skins.chick' => array( |
| 29 | 29 | 'styles' => array( 'skins/chick/main.css' => array( 'media' => 'screen,handheld' ) ), |
| 30 | 30 | ), |
| | 31 | + 'skins.modern' => array( |
| | 32 | + 'styles' => array( 'skins/modern/main.css' => array( 'media' => 'screen' ), |
| | 33 | + 'skins/modern/print.css' => array( 'media' => 'print' ) ), |
| | 34 | + ), |
| 31 | 35 | |
| 32 | 36 | /* jQuery */ |
| 33 | 37 | |