From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- skins/monobook/IE60Fixes.css | 18 ++- skins/monobook/IE70Fixes.css | 14 ++- skins/monobook/external-ltr.png | Bin 0 -> 143 bytes skins/monobook/external.png | Bin 143 -> 0 bytes skins/monobook/main.css | 114 +++++++++--------- skins/monobook/rtl.css | 251 ---------------------------------------- 6 files changed, 81 insertions(+), 316 deletions(-) create mode 100644 skins/monobook/external-ltr.png delete mode 100644 skins/monobook/external.png delete mode 100644 skins/monobook/rtl.css (limited to 'skins/monobook') diff --git a/skins/monobook/IE60Fixes.css b/skins/monobook/IE60Fixes.css index 56e0a16b..3bcd0479 100644 --- a/skins/monobook/IE60Fixes.css +++ b/skins/monobook/IE60Fixes.css @@ -11,16 +11,33 @@ div#column-content div#content { margin-top: 3em; height: 1%; } +.rtl div#column-content div#content { + margin-right: 12.2em; + margin-left: 0; +} div#column-one { position: absolute; top: 0; left: 0; z-index: 4; } +.rtl div#column-one { + left: auto; + right: 0; +} div#footer { margin-left: 13.6em; border-left: 1px solid #fabd23; } +.rtl div#footer { + margin-left: 0; + margin-right: 13.6em; + border-left: none; + border-right: 1px solid #fabd23; +} + + /* the tabs */ + /* the tabs */ @@ -85,7 +102,6 @@ textarea { width: 96%; } -div.editsection, #catlinks, div.tright, div.tleft { diff --git a/skins/monobook/IE70Fixes.css b/skins/monobook/IE70Fixes.css index 91b39efd..fc009e6e 100644 --- a/skins/monobook/IE70Fixes.css +++ b/skins/monobook/IE70Fixes.css @@ -9,6 +9,9 @@ div#column-content div#content { height: 1%; } +.rtl div#column-content div#content { margin-right: 12.2em; margin-left: 0; } + + .rtl div#column-one { /* For some reason it tries to inherit the padding-top into every div, * and I can't figure out how to get it back off. @@ -18,9 +21,13 @@ div#column-content div#content { margin-top: 160px; } -.rtl #bodyContent a.external { - background-image: url(external-rtl.png); - padding: 0 13px 0 0; +/* These elements also have padding-left: 20px; in main.css, but in RTL mode this is flipped. + * That's good in normal browsers, but in IE7 it needs to not be flipped for some daft reason. + * Also clear the right margin (originally margin-left: 1em) + */ +li#pt-userpage, li#pt-anonuserpage, li#pt-login { + padding-left: 20px; + margin-right: 0; } .rtl a.feedlink { @@ -69,7 +76,6 @@ textarea { } /* -div.editsection, #catlinks, div.tright, div.tleft { diff --git a/skins/monobook/external-ltr.png b/skins/monobook/external-ltr.png new file mode 100644 index 00000000..acf260fc Binary files /dev/null and b/skins/monobook/external-ltr.png differ diff --git a/skins/monobook/external.png b/skins/monobook/external.png deleted file mode 100644 index acf260fc..00000000 Binary files a/skins/monobook/external.png and /dev/null differ diff --git a/skins/monobook/main.css b/skins/monobook/main.css index d2330eba..edf79abb 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -41,10 +41,13 @@ div#content { body { font: x-small sans-serif; + /* @embed */ background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat; color: black; margin: 0; padding: 0; + direction: ltr; /* Needed for RTL flipping */ + unicode-bidi: embed; } /* scale back up to a sane default */ @@ -136,6 +139,7 @@ ul { list-style-type: square; margin: .3em 0 0 1.5em; padding: 0; + /* @embed */ list-style-image: url(bullet.gif); } ol { @@ -263,6 +267,7 @@ span.subpages { vertical-align: middle; } #siteNotice { + position: relative; text-align: center; font-size: 95%; padding: 0 0.9em; @@ -306,7 +311,7 @@ in the bottom-right corner of the content area */ margin-right: auto; } /* small for tables and similar */ -.small, .small * { +.small { font-size: 94%; } table.small { @@ -344,7 +349,7 @@ table.small { list-style-type: none; list-style-image: none; margin-left: 0; - padding-left: 0; + padding: 0; text-align: left; } #toc ul ul, @@ -363,10 +368,7 @@ table.small { } /* images */ -div.floatright, table.floatright { - clear: right; - float: right; - position: relative; +/* @noflip */div.floatright, table.floatright { margin: 0 0 .5em .5em; border: 0; /* @@ -375,10 +377,7 @@ div.floatright, table.floatright { */ } div.floatright p { font-style: italic; } -div.floatleft, table.floatleft { - float: left; - clear: left; - position: relative; +/* @noflip */div.floatleft, table.floatleft { margin: 0 .5em .5em 0; border: 0; /* @@ -421,22 +420,15 @@ div.magnify a, div.magnify img { border: none !important; background: none !important; } -div.tright { - clear: right; - float: right; +/* @noflip */div.tright { margin: .5em 0 1.3em 1.4em; } -div.tleft { - float: left; - clear: left; +/* @noflip */div.tleft { margin: .5em 1.4em 1.3em 0; } img.thumbborder { border: 1px solid #dddddd; } -.hiddenStructure { - display: none; -} /* ** classes for special content elements like town boxes @@ -476,36 +468,39 @@ table.rimage { */ #bodyContent a.external, #bodyContent a.external[href ^="gopher://"] { - background: url(external.png) center right no-repeat; - padding: 0 13px; -} -.rtl #bodyContent a.external, -.rtl #bodyContent a.external[href ^="gopher://"] { - background-image: url(external-rtl.png); + /* @embed */ + background: url(external-ltr.png) center right no-repeat; + padding-right: 13px; } #bodyContent a.external[href ^="https://"], .link-https { + /* @embed */ background: url(lock_icon.gif) center right no-repeat; - padding: 0 16px; + padding-right: 16px; } #bodyContent a.external[href ^="mailto:"], .link-mailto { + /* @embed */ background: url(mail_icon.gif) center right no-repeat; - padding: 0 18px; + padding-right: 18px; } #bodyContent a.external[href ^="news://"] { + /* @embed */ background: url(news_icon.png) center right no-repeat; - padding: 0 18px; + padding-right: 18px; } #bodyContent a.external[href ^="ftp://"], .link-ftp { + /* @embed */ background: url(file_icon.gif) center right no-repeat; - padding: 0 18px; + padding-right: 18px; } #bodyContent a.external[href ^="irc://"], +#bodyContent a.external[href ^="ircs://"], .link-irc { + /* @embed */ background: url(discussionitem_icon.gif) center right no-repeat; - padding: 0 18px; + padding-right: 18px; } #bodyContent a.external[href $=".ogg"], #bodyContent a.external[href $=".OGG"], #bodyContent a.external[href $=".mid"], #bodyContent a.external[href $=".MID"], @@ -514,49 +509,54 @@ table.rimage { #bodyContent a.external[href $=".wav"], #bodyContent a.external[href $=".WAV"], #bodyContent a.external[href $=".wma"], #bodyContent a.external[href $=".WMA"], .link-audio { + /* @embed */ background: url("audio.png") center right no-repeat; - padding: 0 13px; + padding-right: 13px; } #bodyContent a.external[href $=".ogm"], #bodyContent a.external[href $=".OGM"], #bodyContent a.external[href $=".avi"], #bodyContent a.external[href $=".AVI"], #bodyContent a.external[href $=".mpeg"], #bodyContent a.external[href $=".MPEG"], #bodyContent a.external[href $=".mpg"], #bodyContent a.external[href $=".MPG"], .link-video { + /* @embed */ background: url("video.png") center right no-repeat; - padding: 0 13px; + padding-right: 13px; } #bodyContent a.external[href $=".pdf"], #bodyContent a.external[href $=".PDF"], #bodyContent a.external[href *=".pdf#"], #bodyContent a.external[href *=".PDF#"], #bodyContent a.external[href *=".pdf?"], #bodyContent a.external[href *=".PDF?"], .link-document { + /* @embed */ background: url("document.png") center right no-repeat; - padding: 0 12px; -} - -/* for rtl wikis */ -.rtl #bodyContent a.external { - background-position: left; - padding-right: 0; -} -.rtl a.feedlink { - background-position: right; - padding-right: 16px; - padding-left: 0; + padding-right: 12px; } - -/* correction for ltr wikis */ -.ltr #bodyContent a.external { - padding-left: 0; -} - -/* disable interwiki styling */ + +/* Interwiki Styling */ #bodyContent a.extiw, #bodyContent a.extiw:active { color: #36b; + /* Don't show icons for interwiki links */ + background: none; + padding: 0; } +#bodyContent a.extiw:visited { + color: #636; +} +#bodyContent a.extiw:active { + color: #b63; +} + +/* External links */ #bodyContent a.external { color: #36b; } +#bodyContent a.external:visited { + color: #636; /* bug 3112 */ +} +#bodyContent a.external:active { + color: #b63; +} + /* ** Structural Elements */ @@ -617,6 +617,7 @@ table.rimage { .portlet ul { line-height: 1.5em; list-style-type: square; + /* @embed */ list-style-image: url(bullet.gif); font-size: 95%; } @@ -753,6 +754,7 @@ in bg url to hide it from iemac */ li#pt-userpage, li#pt-anonuserpage, li#pt-login { + /* @embed */ background: url(user.gif) top left no-repeat; padding-left: 20px; text-transform: none; @@ -848,9 +850,6 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print { border: 0; padding: 0; } -#p-cactions .hiddenStructure { - display: none; -} #p-cactions li a { text-transform: lowercase; } @@ -1007,10 +1006,6 @@ div#userlogin form#userlogin2 { background-color: #f9f9f9; float: left; } -.rtl div#userloginForm form, -.rtl div#userlogin form#userlogin2 { - float: right; -} div#userloginForm table, div#userlogin form#userlogin2 table { @@ -1080,7 +1075,6 @@ div#userloginForm .captcha { display: inline; margin-bottom: 0; } -* html div.editsection { font-size: smaller; } #pagehistory li.selected { position: relative; } /* Mac IE 5.0 fix; floated content turns invisible */ @@ -1254,4 +1248,4 @@ div.mw-lag-warn-high { /* Tooltips are outside of the normal body code, so this helps make the size of the text sensible */ .tipsy { font-size: 127%; -} \ No newline at end of file +} diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css deleted file mode 100644 index 52507676..00000000 --- a/skins/monobook/rtl.css +++ /dev/null @@ -1,251 +0,0 @@ -/* -Right-to-left fixes for MonoBook. -Places sidebar on right, tweaks various alignment issues. - -Works mostly ok nicely on Safari 1.2.1; fine in Mozilla. - -Safari bugs (1.2.1): -* Tabs are still appearing in left-to-right order. (Try after localizing) - -Opera bugs (7.23 linux): -* Some bits of ltr text (sidebar box titles) have forward and backward versions overlapping each other - -IE/mac bugs: -* The thing barfs on Hebrew and Arabic anyway, so no point testing. - -Missing features due to lack of support: -* external link icons - -To test: -* Opera6 -* IE 5.0 -* etc - -*/ -body { - direction: rtl; - unicode-bidi: embed; -} -div#column-content { - margin: 0 -12.2em 0 0; - float: left; -} -div#column-content div#content{ - margin-left: 0; - margin-right: 12.2em; - border-right: 1px solid #aaaaaa; - border-left: none; -} -html > body .portlet { - float: right; - clear: right; -} -.editsection { - float: left; - margin-right: 5px; - margin-left: 0; /* bug 9122: undo default LTR */ -} -/* recover IEMac (might be fine with the float, but usually it's close to IE */ -*>body .portlet { - float: none; - clear: none; -} -.pBody { - padding-right: 0.8em; - padding-left: 0.5em; -} - -/* Fix alignment */ -.documentByLine, -.portletDetails, -.portletMore, -#p-personal { - text-align: left; -} - -div div.thumbcaption { - text-align: right; -} - -div.magnify, -#p-logo { - left: auto; - right: 0; -} -#p-personal { - left: auto; - right: 0; -} - -#p-cactions { - left: auto; - right: 11.5em; - padding-left: 0; - padding-right: 1em; -} -#p-cactions li { - margin-left: 0.3em; - margin-right: 0; - float: right; -} -* html #p-cactions li a { - display: block; - padding-bottom: 0; -} -* html #p-cactions li a:hover { - padding-bottom: 0.2em; -} -/* offsets to distinguish the tab groups */ -li#ca-talk { - margin-right: auto; - margin-left: 1.6em; -} -li#ca-watch,li#ca-unwatch { - margin-right: 1.6em !important; -} - -/* Fix margins for non-css2 browsers */ -/* top right bottom left */ - -ul { - margin-left: 0; - margin-right: 1.5em; -} -ol { - margin-left: 0; - margin-right: 2.4em; -} -dd { - margin-left: 0; - margin-right: 1.6em; -} -#contentSub { - margin-right: 1em; - margin-left: 0; -} -.tocindent { - margin-left: 0; - margin-right: 2em; -} -div.tright, div.floatright, table.floatright { - clear: none; -} -div.tleft, div.floatleft, table.floatleft { - clear: left; -} -#p-personal li { - margin-left: 0; - margin-right: 1em; -} - -li#ca-talk, -li#ca-watch { - margin-right: auto; - margin-left: 1.6em; -} - -#p-personal li { - float: left; -} -/* Fix link icons -.external, a.feedlink { - padding: 0 !important; - background: none !important; -} -*/ -div#footer { - clear: both; -} -#f-poweredbyico { - float: left; - height: 1%; -} -#f-copyrightico { - float: right; - height: 1%; -} -* html div#footer { - margin-left: 0; - margin-right: 13.6em; - border-left: 0; - border-right: 1px solid #fabd23; -} -* html div#column-content { - float: none; - margin-left: 0; - margin-right: 0; -} -* html div#column-content div#content { - margin-left: 0; - margin-top: 3em; -} -* html div#column-one { right: 0; } - -/* js pref toc */ - -#preftoc { - margin-right: 1em; -} - -.errorbox, .successbox, #preftoc li, .prefsection fieldset { - float: right; -} - -.prefsection { - padding-right: 2em; -} - -/* workaround for moz bug, displayed bullets on left side */ - -#toc ul { - text-align: right; -} - -#toc ul ul { - margin: 0 2em 0 0; -} - -input#wpSave, input#wpDiff { - margin-right: 0; - margin-left: .33em; -} - -#userlogin { - margin: 0 0 1em 3em; -} -/* Convenience links to edit block, delete and protect reasons */ -p.mw-ipb-conveniencelinks, p.mw-protect-editreasons, -p.mw-filedelete-editreasons, p.mw-delete-editreasons { - float: left; -} - -.toggle { - margin-left: 0em; - margin-right: 2em; -} -table.filehistory th { - text-align: right; -} - -/* Special:AllPages styling */ -td.mw-allpages-nav, p.mw-allpages-nav, td.mw-allpages-alphaindexline { - text-align: left; -} - -/* Special:PrefixIndex styling */ -td#mw-prefixindex-nav-form { - text-align: left; -} - -/** - * Lists: - * The following lines don't have a visible effect on non-Gecko browsers - * They fix a problem ith Gecko browsers rendering lists to the right of - * left-floated objects in an RTL layout. - */ -html > body div#article ul { - display: table; -} -html > body div#bodyContent ul#filetoc { - display: block; -} -- cgit v1.2.3-54-g00ecf