r80163 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r80162‎ | r80163 | r80164 >
Date:11:28, 13 January 2011
Author:hartman
Status:ok
Tags:
Comment:
Convert simple skin to Resource loader.

I removed all of the useroptions generators that were dupe with resourceloaderuseroptions.
The 'highlightbroken' option differs from what is in resourceloaderuseroptions and still remains to be ported.

Bugzilla #26649
Modified paths:
  • /trunk/phase3/skins/Simple.php (modified) (history)
  • /trunk/phase3/skins/simple/rtl.css (deleted) (history)

Diff [purge]

Index: trunk/phase3/skins/Simple.php
@@ -25,16 +25,11 @@
2626 parent::setupSkinUserCss( $out );
2727
2828 $out->addStyle( 'simple/main.css', 'screen' );
29 - $out->addStyle( 'simple/rtl.css', '', '', 'rtl' );
3029 }
3130
3231 function reallyGenerateUserStylesheet() {
3332 global $wgUser;
3433 $s = '';
35 - if( ( $undopt = $wgUser->getOption( 'underline' ) ) != 2 ) {
36 - $underline = $undopt ? 'underline' : 'none';
37 - $s .= "a { text-decoration: $underline; }\n";
38 - }
3934 if( $wgUser->getOption( 'highlightbroken' ) ) {
4035 $s .= "a.new, #quickbar a.new { text-decoration: line-through; }\n";
4136 } else {
@@ -56,15 +51,6 @@
5752 }
5853 CSS;
5954 }
60 - if( $wgUser->getOption( 'justify' ) ) {
61 - $s .= "#article, #bodyContent { text-align: justify; }\n";
62 - }
63 - if( !$wgUser->getOption( 'showtoc' ) ) {
64 - $s .= "#toc { display: none; }\n";
65 - }
66 - if( !$wgUser->getOption( 'editsection' ) ) {
67 - $s .= ".editsection { display: none; }\n";
68 - }
6955 return $s;
7056 }
7157 }
Index: trunk/phase3/skins/simple/rtl.css
@@ -1,186 +0,0 @@
2 -/*
3 -Right-to-left fixes for Simple.
4 -Places sidebar on right, tweaks various alignment issues.
5 -
6 -Works mostly ok nicely on Safari 1.2.1; fine in Mozilla.
7 -
8 -Safari bugs (1.2.1):
9 -* Tabs are still appearing in left-to-right order. (Try after localizing)
10 -
11 -Opera bugs (7.23 linux):
12 -* Some bits of ltr text (sidebar box titles) have forward and backward versions overlapping each other
13 -
14 -IE/mac bugs:
15 -* The thing barfs on Hebrew and Arabic anyway, so no point testing.
16 -
17 -Missing features due to lack of support:
18 -* external link icons
19 -
20 -To test:
21 -* Opera6
22 -* IE 5.0
23 -* etc
24 -
25 -*/
26 -body {
27 - direction: rtl;
28 - unicode-bidi: embed;
29 -}
30 -#column-content {
31 - margin: 0 -12.2em 0 0;
32 - float: left;
33 -}
34 -#column-content #content{
35 - margin-left: 0;
36 - margin-right: 12.2em;
37 - border-right: 1px solid #aaaaaa;
38 - border-left: none;
39 -}
40 -html>body .portlet {
41 - float: right;
42 - clear: right;
43 -}
44 -.editsection {
45 - float: left;
46 - margin-right: 5px;
47 - margin-left: 0; /* bug 9122: undo default LTR */
48 -}
49 -/* recover IEMac (might be fine with the float, but usually it's close to IE */
50 -*>body .portlet {
51 - float: none;
52 - clear: none;
53 -}
54 -.pBody {
55 - padding: 0 0.5em 0.3em 0.8em;
56 -}
57 -
58 -/* Fix alignment */
59 -.documentByLine,
60 -.portletDetails,
61 -.portletMore {
62 - text-align: left;
63 -}
64 -
65 -div div.thumbcaption {
66 - text-align: right;
67 -}
68 -
69 -div.magnify,
70 -#p-logo {
71 - left: auto;
72 - right: 0;
73 -}
74 -
75 -/* Fix margins for non-css2 browsers */
76 -/* top right bottom left */
77 -
78 -dd {
79 - margin-left: 0;
80 - margin-right: 1.6em;
81 -}
82 -#contentSub {
83 - margin-right: 1em;
84 - margin-left: 0;
85 -}
86 -.tocindent {
87 - margin-left: 0;
88 - margin-right: 2em;
89 -}
90 -div.tright, div.floatright, table.floatright {
91 - clear: none;
92 -}
93 -div.tleft, div.floatleft, table.floatleft {
94 - clear: left;
95 -}
96 -
97 -/* Fix link icons */
98 -.external, a.feedlink {
99 - padding: 0 !important;
100 - background: none !important;
101 -}
102 -#footer {
103 - clear: both;
104 -}
105 -* html #footer {
106 - margin-left: 0;
107 - margin-right: 13.6em;
108 - border-left: 0;
109 - border-right: 1px solid #fabd23;
110 -}
111 -* html #column-content {
112 - float: none;
113 - margin-left: 0;
114 - margin-right: 0;
115 -}
116 -* html #column-content #content {
117 - margin-left: 0;
118 - margin-top: 3em;
119 -}
120 -* html #column-one { right: 0; }
121 -
122 -/* js pref toc */
123 -
124 -#preftoc {
125 - margin-right: 1em;
126 -}
127 -
128 -.errorbox, .successbox, #preftoc li, .prefsection fieldset {
129 - float: right;
130 -}
131 -
132 -.prefsection {
133 - padding-right: 2em;
134 -}
135 -
136 -/* workaround for moz bug, displayed bullets on left side */
137 -
138 -#toc ul {
139 - text-align: right;
140 -}
141 -
142 -#toc ul ul {
143 - margin: 0 2em 0 0;
144 -}
145 -
146 -input#wpSave, input#wpDiff {
147 - margin-right: 0;
148 - margin-left: .33em;
149 -}
150 -
151 -#userlogin {
152 - margin: 0 0 1em 3em;
153 -}
154 -/* Convenience links to edit block, delete and protect reasons */
155 -p.mw-ipb-conveniencelinks, p.mw-protect-editreasons,
156 -p.mw-filedelete-editreasons, p.mw-delete-editreasons {
157 - float: left;
158 -}
159 -
160 -.toggle {
161 - margin-left: 0em;
162 - margin-right: 2em;
163 -}
164 -table.filehistory th {
165 - text-align: right;
166 -}
167 -
168 -/**
169 - * Lists:
170 - * The following lines don't have a visible effect on non-Gecko browsers
171 - * They fix a problem ith Gecko browsers rendering lists to the right of
172 - * left-floated objects in an RTL layout.
173 - */
174 -html > body div#bodyContent ul {
175 - display: table;
176 -}
177 -
178 -/* Special:Allpages styling */
179 -td.mw-allpages-nav, p.mw-allpages-nav, td.mw-allpages-alphaindexline {
180 - text-align: left;
181 -}
182 -
183 -/* Special:Prefixindex styling */
184 -td#mw-prefixindex-nav-form {
185 - text-align: left;
186 -}
187 -

Follow-up revisions

RevisionCommit summaryAuthorDate
r805291.17: MFT r80163, r80222, r80223, r80319, r80322, r80472, r80481, r80492catrope23:00, 18 January 2011

Status & tagging log