r95837 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r95836‎ | r95837 | r95838 >
Date:06:59, 31 August 2011
Author:dantman
Status:ok (Comments)
Tags:
Comment:
Remove the basic styles that vector coppied from monobook from both monobook and vector and relocate them to a series of css stylesheets which 3rd party skins can include.
Havent touched Modern yet. External link icons are too complex to deal with this round due to vector and monobook using different icons.
Modified paths:
  • /trunk/phase3/resources/Resources.php (modified) (history)
  • /trunk/phase3/skins/MonoBook.php (modified) (history)
  • /trunk/phase3/skins/Vector.php (modified) (history)
  • /trunk/phase3/skins/common/commonContent.css (added) (history)
  • /trunk/phase3/skins/common/commonElements.css (added) (history)
  • /trunk/phase3/skins/common/commonInterface.css (added) (history)
  • /trunk/phase3/skins/monobook/main.css (modified) (history)
  • /trunk/phase3/skins/vector/screen.css (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/monobook/main.css
@@ -59,136 +59,21 @@
6060 }
6161
6262 /* general styles */
63 -
64 -table {
65 - font-size: 100%;
66 -}
6763 a {
68 - text-decoration: none;
6964 color: #002bb8;
70 - background: none;
7165 }
7266 a:visited {
7367 color: #5a3696;
7468 }
75 -a:active {
76 - color: #faa700;
77 -}
78 -a:hover {
79 - text-decoration: underline;
80 -}
81 -a.stub {
82 - color: #772233;
83 -}
8469 a.new, #p-personal a.new {
8570 color: #cc2200;
8671 }
87 -a.new:visited, #p-personal a.new:visited {
88 - color: #a55858;
89 -}
9072
91 -img {
92 - border: none;
93 - vertical-align: middle;
94 -}
95 -p {
96 - margin: .4em 0 .5em 0;
97 - line-height: 1.5em;
98 -}
99 -p img {
100 - margin: 0;
101 -}
102 -
103 -hr {
104 - height: 1px;
105 - color: #aaa;
106 - background-color: #aaa;
107 - border: 0;
108 - margin: .2em 0 .2em 0;
109 -}
110 -
111 -h1, h2, h3, h4, h5, h6 {
112 - color: black;
113 - background: none;
114 - font-weight: normal;
115 - margin: 0;
116 - overflow: hidden;
117 - padding-top: .5em;
118 - padding-bottom: .17em;
119 - border-bottom: 1px solid #aaa;
120 -}
121 -h1 { font-size: 188%; }
122 -h1 .editsection { font-size: 53%; }
123 -h2 { font-size: 150%; }
124 -h2 .editsection { font-size: 67%; }
125 -h3, h4, h5, h6 {
126 - border-bottom: none;
127 - font-weight: bold;
128 -}
129 -h3 { font-size: 132%; }
130 -h3 .editsection { font-size: 76%; font-weight: normal; }
131 -h4 { font-size: 116%; }
132 -h4 .editsection { font-size: 86%; font-weight: normal; }
133 -h5 { font-size: 100%; }
134 -h5 .editsection { font-weight: normal; }
135 -h6 { font-size: 80%; }
136 -h6 .editsection { font-size: 125%; font-weight: normal; }
137 -
13873 ul {
139 - line-height: 1.5em;
140 - list-style-type: square;
141 - margin: .3em 0 0 1.5em;
142 - padding: 0;
14374 /* @embed */
14475 list-style-image: url(bullet.gif);
14576 }
146 -ol {
147 - line-height: 1.5em;
148 - margin: .3em 0 0 3.2em;
149 - padding: 0;
150 - list-style-image: none;
151 -}
152 -li {
153 - margin-bottom: .1em;
154 -}
155 -dt {
156 - font-weight: bold;
157 - margin-bottom: .1em;
158 -}
159 -dl {
160 - margin-top: .2em;
161 - margin-bottom: .5em;
162 -}
163 -dd {
164 - line-height: 1.5em;
165 - margin-left: 2em;
166 - margin-bottom: .1em;
167 -}
16877
169 -fieldset {
170 - border: 1px solid #2f6fab;
171 - margin: 1em 0 1em 0;
172 - padding: 0 1em 1em;
173 - line-height: 1.5em;
174 -}
175 -fieldset.nested {
176 - margin: 0 0 0.5em 0;
177 - padding: 0 0.5em 0.5em;
178 -}
179 -legend {
180 - padding: .5em;
181 - font-size: 95%;
182 -}
183 -form {
184 - border: none;
185 - margin: 0;
186 -}
187 -
188 -textarea {
189 - width: 100%;
190 - padding: .1em;
191 -}
192 -
19378 input.historysubmit {
19479 padding: 0 .3em .3em .3em !important;
19580 font-size: 94%;
@@ -196,26 +81,8 @@
19782 height: 1.7em !important;
19883 margin-left: 1.6em;
19984 }
200 -select {
201 - vertical-align: top;
202 -}
203 -q {
204 - font-family: Times, "Times New Roman", serif;
205 - font-style: italic;
206 -}
207 -/* disabled for now
208 -blockquote {
209 - font-family: Times, "Times New Roman", serif;
210 - font-style: italic;
211 -}*/
212 -code {
213 - background-color: #f9f9f9;
214 -}
 85+
21586 pre {
216 - padding: 1em;
217 - border: 1px dashed #2f6fab;
218 - color: black;
219 - background-color: #f9f9f9;
22087 line-height: 1.1em;
22188 }
22289
@@ -223,24 +90,6 @@
22491 ** the main content area
22592 */
22693
227 -#siteSub {
228 - display: none;
229 -}
230 -#jump-to-nav {
231 - display: none;
232 -}
233 -
234 -#contentSub, #contentSub2 {
235 - font-size: 84%;
236 - line-height: 1.2em;
237 - margin: 0 0 1.4em 1em;
238 - color: #7d7d7d;
239 - width: auto;
240 -}
241 -span.subpages {
242 - display: block;
243 -}
244 -
24594 /* Some space under the headers in the content area */
24695 #bodyContent h1, #bodyContent h2 {
24796 margin-bottom: .6em;
@@ -256,16 +105,6 @@
257106 padding-bottom: 0;
258107 }
259108
260 -/* user notification thing */
261 -.usermessage {
262 - background-color: #ffce7b;
263 - border: 1px solid #ffa500;
264 - color: black;
265 - font-weight: bold;
266 - margin: 2em 0 1em;
267 - padding: .5em 1em;
268 - vertical-align: middle;
269 -}
270109 #siteNotice {
271110 position: relative;
272111 text-align: center;
@@ -277,13 +116,6 @@
278117 padding: 0;
279118 }
280119
281 -.catlinks {
282 - border: 1px solid #aaa;
283 - background-color: #f9f9f9;
284 - padding: 5px;
285 - margin-top: 1em;
286 - clear: both;
287 -}
288120 /* currently unused, intended to be used by a metadata box
289121 in the bottom-right corner of the content area */
290122 .documentDescription {
@@ -301,136 +133,7 @@
302134 color: #76797c;
303135 }
304136
305 -/* emulate center */
306 -.center {
307 - width: 100%;
308 - text-align: center;
309 -}
310 -*.center * {
311 - margin-left: auto;
312 - margin-right: auto;
313 -}
314 -/* small for tables and similar */
315 -.small {
316 - font-size: 94%;
317 -}
318 -table.small {
319 - font-size: 100%;
320 -}
321 -
322137 /*
323 -** content styles
324 -*/
325 -
326 -#toc,
327 -.toc,
328 -.mw-warning {
329 - border: 1px solid #aaa;
330 - background-color: #f9f9f9;
331 - padding: 5px;
332 - font-size: 95%;
333 -}
334 -#toc h2,
335 -.toc h2 {
336 - display: inline;
337 - border: none;
338 - padding: 0;
339 - font-size: 100%;
340 - font-weight: bold;
341 -}
342 -#toc #toctitle,
343 -.toc #toctitle,
344 -#toc .toctitle,
345 -.toc .toctitle {
346 - text-align: center;
347 -}
348 -#toc ul,
349 -.toc ul {
350 - list-style-type: none;
351 - list-style-image: none;
352 - margin-left: 0;
353 - padding-left: 0;
354 - text-align: left;
355 -}
356 -#toc ul ul,
357 -.toc ul ul {
358 - margin: 0 0 0 2em;
359 -}
360 -#toc .toctoggle,
361 -.toc .toctoggle {
362 - font-size: 94%;
363 -}
364 -
365 -.mw-warning {
366 - margin-left: 50px;
367 - margin-right: 50px;
368 - text-align: center;
369 -}
370 -
371 -/* images */
372 -/* @noflip */div.floatright, table.floatright {
373 - margin: 0 0 .5em .5em;
374 - border: 0;
375 -/*
376 - border: .5em solid white;
377 - border-width: .5em 0 .8em 1.4em;
378 -*/
379 -}
380 -div.floatright p { font-style: italic; }
381 -/* @noflip */div.floatleft, table.floatleft {
382 - margin: 0 .5em .5em 0;
383 - border: 0;
384 -/*
385 - margin: .3em .5em .5em 0;
386 - border: .5em solid white;
387 - border-width: .5em 1.4em .8em 0;
388 -*/
389 -}
390 -div.floatleft p { font-style: italic; }
391 -/* thumbnails */
392 -div.thumb {
393 - margin-bottom: .5em;
394 - width: auto;
395 -}
396 -div.thumbinner {
397 - border: 1px solid #ccc;
398 - padding: 3px !important;
399 - background-color: #f9f9f9;
400 - font-size: 94%;
401 - text-align: center;
402 - overflow: hidden;
403 -}
404 -html .thumbimage {
405 - border: 1px solid #ccc;
406 -}
407 -html .thumbcaption {
408 - border: none;
409 - text-align: left;
410 - line-height: 1.4em;
411 - padding: 3px !important;
412 - font-size: 94%;
413 -}
414 -div.magnify {
415 - float: right;
416 - border: none !important;
417 - background: none !important;
418 -}
419 -div.magnify a, div.magnify img {
420 - display: block;
421 - border: none !important;
422 - background: none !important;
423 -}
424 -/* @noflip */div.tright {
425 - margin: .5em 0 1.3em 1.4em;
426 -}
427 -/* @noflip */div.tleft {
428 - margin: .5em 1.4em 1.3em 0;
429 -}
430 -img.thumbborder {
431 - border: 1px solid #dddddd;
432 -}
433 -
434 -/*
435138 ** classes for special content elements like town boxes
436139 ** intended to be referenced directly from the wiki src
437140 */
@@ -446,12 +149,6 @@
447150 margin-bottom: 1em;
448151 text-align: center;
449152 }
450 -.toccolours {
451 - border: 1px solid #aaa;
452 - background-color: #f9f9f9;
453 - padding: 5px;
454 - font-size: 95%;
455 -}
456153
457154 /*
458155 ** edit views etc
@@ -535,27 +232,12 @@
536233 #bodyContent a.extiw,
537234 #bodyContent a.extiw:active {
538235 color: #36b;
539 - /* Don't show icons for interwiki links */
540 - background: none;
541 - padding: 0;
542236 }
543 -#bodyContent a.extiw:visited {
544 - color: #636;
545 -}
546 -#bodyContent a.extiw:active {
547 - color: #b63;
548 -}
549237
550238 /* External links */
551239 #bodyContent a.external {
552240 color: #36b;
553241 }
554 -#bodyContent a.external:visited {
555 - color: #636; /* bug 3112 */
556 -}
557 -#bodyContent a.external:active {
558 - color: #b63;
559 -}
560242
561243 /*
562244 ** Structural Elements
Index: trunk/phase3/skins/common/commonInterface.css
@@ -0,0 +1,42 @@
 2+/*
 3+** MediaWiki style sheet for common core styles on interfaces
 4+*/
 5+
 6+/* Categories */
 7+.catlinks {
 8+ border: 1px solid #aaa;
 9+ background-color: #f9f9f9;
 10+ padding: 5px;
 11+ margin-top: 1em;
 12+ clear: both;
 13+}
 14+
 15+/* User Message */
 16+.usermessage {
 17+ background-color: #ffce7b;
 18+ border: 1px solid #ffa500;
 19+ color: black;
 20+ font-weight: bold;
 21+ margin: 2em 0 1em;
 22+ padding: .5em 1em;
 23+ vertical-align: middle;
 24+}
 25+
 26+/* Sub-navigation */
 27+#siteSub {
 28+ display: none;
 29+}
 30+#jump-to-nav {
 31+ display: none;
 32+}
 33+#contentSub, #contentSub2 {
 34+ font-size: 84%;
 35+ line-height: 1.2em;
 36+ margin: 0 0 1.4em 1em;
 37+ color: #7d7d7d;
 38+ width: auto;
 39+}
 40+span.subpages {
 41+ display: block;
 42+}
 43+
Property changes on: trunk/phase3/skins/common/commonInterface.css
___________________________________________________________________
Added: svn:eol-style
144 + native
Index: trunk/phase3/skins/common/commonContent.css
@@ -0,0 +1,113 @@
 2+/*
 3+** MediaWiki style sheet for general styles on complex content
 4+*/
 5+
 6+/* Table of Contents */
 7+#toc,
 8+.toc,
 9+.mw-warning {
 10+ border: 1px solid #aaa;
 11+ background-color: #f9f9f9;
 12+ padding: 5px;
 13+ font-size: 95%;
 14+}
 15+#toc h2,
 16+.toc h2 {
 17+ display: inline;
 18+ border: none;
 19+ padding: 0;
 20+ font-size: 100%;
 21+ font-weight: bold;
 22+}
 23+#toc #toctitle,
 24+.toc #toctitle,
 25+#toc .toctitle,
 26+.toc .toctitle {
 27+ text-align: center;
 28+}
 29+#toc ul,
 30+.toc ul {
 31+ list-style-type: none;
 32+ list-style-image: none;
 33+ margin-left: 0;
 34+ padding-left: 0;
 35+ text-align: left;
 36+}
 37+#toc ul ul,
 38+.toc ul ul {
 39+ margin: 0 0 0 2em;
 40+}
 41+#toc .toctoggle,
 42+.toc .toctoggle {
 43+ font-size: 94%;
 44+}
 45+
 46+.toccolours {
 47+ border: 1px solid #aaa;
 48+ background-color: #f9f9f9;
 49+ padding: 5px;
 50+ font-size: 95%;
 51+}
 52+
 53+/* Warning */
 54+.mw-warning {
 55+ margin-left: 50px;
 56+ margin-right: 50px;
 57+ text-align: center;
 58+}
 59+
 60+/* Images */
 61+/* @noflip */div.floatright, table.floatright {
 62+ margin: 0 0 .5em .5em;
 63+ border: 0;
 64+}
 65+div.floatright p { font-style: italic; }
 66+/* @noflip */div.floatleft, table.floatleft {
 67+ margin: 0 .5em .5em 0;
 68+ border: 0;
 69+}
 70+div.floatleft p { font-style: italic; }
 71+/* Thumbnails */
 72+div.thumb {
 73+ margin-bottom: .5em;
 74+ width: auto;
 75+ background-color: transparent;
 76+}
 77+div.thumbinner {
 78+ border: 1px solid #ccc;
 79+ padding: 3px !important;
 80+ background-color: #f9f9f9;
 81+ font-size: 94%;
 82+ text-align: center;
 83+ overflow: hidden;
 84+}
 85+html .thumbimage {
 86+ border: 1px solid #ccc;
 87+}
 88+html .thumbcaption {
 89+ border: none;
 90+ text-align: left;
 91+ line-height: 1.4em;
 92+ padding: 3px !important;
 93+ font-size: 94%;
 94+}
 95+div.magnify {
 96+ float: right;
 97+ border: none !important;
 98+ background: none !important;
 99+}
 100+div.magnify a, div.magnify img {
 101+ display: block;
 102+ border: none !important;
 103+ background: none !important;
 104+}
 105+/* @noflip */div.tright {
 106+ margin: .5em 0 1.3em 1.4em;
 107+}
 108+/* @noflip */div.tleft {
 109+ margin: .5em 1.4em 1.3em 0;
 110+}
 111+img.thumbborder {
 112+ border: 1px solid #dddddd;
 113+}
 114+
Property changes on: trunk/phase3/skins/common/commonContent.css
___________________________________________________________________
Added: svn:eol-style
1115 + native
Index: trunk/phase3/skins/common/commonElements.css
@@ -0,0 +1,219 @@
 2+/*
 3+** MediaWiki style sheet for general styles on basic content elements
 4+*/
 5+
 6+/* Links */
 7+a {
 8+ text-decoration: none;
 9+ color: #0645ad;
 10+ background: none;
 11+}
 12+a:visited {
 13+ color: #0b0080;
 14+}
 15+a:active {
 16+ color: #faa700;
 17+}
 18+a:hover, a:focus {
 19+ text-decoration: underline;
 20+}
 21+a.stub {
 22+ color: #772233;
 23+}
 24+a.new, #p-personal a.new {
 25+ color: #ba0000;
 26+}
 27+a.new:visited, #p-personal a.new:visited {
 28+ color: #a55858;
 29+}
 30+
 31+/* Interwiki Styling */
 32+.mw-body a.extiw,
 33+.mw-body a.extiw:active {
 34+ color: #59e;
 35+ /* Don't show icons for interwiki links */
 36+ background: none;
 37+ padding: 0;
 38+}
 39+.mw-body a.extiw:visited {
 40+ color: #636;
 41+}
 42+.mw-body a.extiw:active {
 43+ color: #b63;
 44+}
 45+
 46+/* External links */
 47+.mw-body a.external {
 48+ color: #59e;
 49+}
 50+.mw-body a.external:visited {
 51+ color: #636; /* bug 3112 */
 52+}
 53+.mw-body a.external:active {
 54+ color: #b63;
 55+}
 56+
 57+/* Inline Elements */
 58+img {
 59+ border: none;
 60+ vertical-align: middle;
 61+}
 62+hr {
 63+ height: 1px;
 64+ color: #aaa;
 65+ background-color: #aaa;
 66+ border: 0;
 67+ margin: .2em 0;
 68+}
 69+
 70+/* Structural Elements */
 71+h1,
 72+h2,
 73+h3,
 74+h4,
 75+h5,
 76+h6 {
 77+ color: black;
 78+ background: none;
 79+ font-weight: normal;
 80+ margin: 0;
 81+ overflow: hidden;
 82+ padding-top: .5em;
 83+ padding-bottom: .17em;
 84+ border-bottom: 1px solid #aaa;
 85+ width: auto;
 86+}
 87+h1 { font-size: 188%; }
 88+h1 .editsection { font-size: 53%; }
 89+h2 { font-size: 150%; }
 90+h2 .editsection { font-size: 67%; }
 91+h3,
 92+h4,
 93+h5,
 94+h6 {
 95+ border-bottom: none;
 96+ font-weight: bold;
 97+}
 98+h3 { font-size: 132%; }
 99+h3 .editsection { font-size: 76%; font-weight: normal; }
 100+h4 { font-size: 116%; }
 101+h4 .editsection { font-size: 86%; font-weight: normal; }
 102+h5 { font-size: 100%; }
 103+h5 .editsection { font-weight: normal; }
 104+h6 { font-size: 80%; }
 105+h6 .editsection { font-size: 125%; font-weight: normal; }
 106+
 107+p {
 108+ margin: .4em 0 .5em 0;
 109+ line-height: 1.5em;
 110+}
 111+p img {
 112+ margin: 0;
 113+}
 114+
 115+ul {
 116+ line-height: 1.5em;
 117+ list-style-type: square;
 118+ margin: .3em 0 0 1.5em;
 119+ padding: 0;
 120+ /* @embed */
 121+ list-style-image: url(images/bullet-icon.png);
 122+}
 123+ol {
 124+ line-height: 1.5em;
 125+ margin: .3em 0 0 3.2em;
 126+ padding: 0;
 127+ list-style-image: none;
 128+}
 129+li {
 130+ margin-bottom: .1em;
 131+}
 132+dt {
 133+ font-weight: bold;
 134+ margin-bottom: .1em;
 135+}
 136+dl {
 137+ margin-top: .2em;
 138+ margin-bottom: .5em;
 139+}
 140+dd {
 141+ line-height: 1.5em;
 142+ margin-left: 2em;
 143+ margin-bottom: .1em;
 144+}
 145+
 146+q {
 147+ font-family: Times, "Times New Roman", serif;
 148+ font-style: italic;
 149+}
 150+/* Disabled for now
 151+blockquote {
 152+ font-family: Times, "Times New Roman", serif;
 153+ font-style: italic;
 154+}*/
 155+pre, code, tt, kbd, samp {
 156+ /*
 157+ * It's important for this rule to first reference an actual font name, some browsers will render the monospace text
 158+ * too small otherwise, namely Firefox, Chrome and Safari
 159+ */
 160+ font-family: monospace, "Courier New";
 161+}
 162+code {
 163+ background-color: #f9f9f9;
 164+}
 165+pre {
 166+ padding: 1em;
 167+ border: 1px dashed #2f6fab;
 168+ color: black;
 169+ background-color: #f9f9f9;
 170+}
 171+
 172+/* Tables */
 173+table {
 174+ font-size: 100%;
 175+}
 176+
 177+/* Forms */
 178+fieldset {
 179+ border: 1px solid #2f6fab;
 180+ margin: 1em 0 1em 0;
 181+ padding: 0 1em 1em;
 182+ line-height: 1.5em;
 183+}
 184+fieldset.nested {
 185+ margin: 0 0 0.5em 0;
 186+ padding: 0 0.5em 0.5em;
 187+}
 188+legend {
 189+ padding: .5em;
 190+ font-size: 95%;
 191+}
 192+form {
 193+ border: none;
 194+ margin: 0;
 195+}
 196+textarea {
 197+ width: 100%;
 198+ padding: .1em;
 199+}
 200+select {
 201+ vertical-align: top;
 202+}
 203+
 204+/* Emulate Center */
 205+.center {
 206+ width: 100%;
 207+ text-align: center;
 208+}
 209+*.center * {
 210+ margin-left: auto;
 211+ margin-right: auto;
 212+}
 213+/* Small for tables and similar */
 214+.small {
 215+ font-size: 94%;
 216+}
 217+table.small {
 218+ font-size: 100%;
 219+}
 220+
Property changes on: trunk/phase3/skins/common/commonElements.css
___________________________________________________________________
Added: svn:eol-style
1221 + native
Index: trunk/phase3/skins/Vector.php
@@ -135,7 +135,7 @@
136136 <div id="mw-page-base" class="noprint"></div>
137137 <div id="mw-head-base" class="noprint"></div>
138138 <!-- content -->
139 - <div id="content">
 139+ <div id="content" class="mw-body">
140140 <a id="top"></a>
141141 <div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div>
142142 <?php if ( $this->data['sitenotice'] ): ?>
Index: trunk/phase3/skins/vector/screen.css
@@ -688,283 +688,13 @@
689689 #bodyContent {
690690 font-size: 0.8em;
691691 }
692 -/* Links */
693 -a {
694 - text-decoration: none;
695 - color: #0645ad;
696 - background: none;
697 -}
698 -a:visited {
699 - color: #0b0080;
700 -}
701 -a:active {
702 - color: #faa700;
703 -}
704 -a:hover, a:focus {
705 - text-decoration: underline;
706 -}
707 -a.stub {
708 - color: #772233;
709 -}
710 -a.new, #p-personal a.new {
711 - color: #ba0000;
712 -}
713 -a.new:visited, #p-personal a.new:visited {
714 - color: #a55858;
715 -}
716692
717 -/* Inline Elements */
718 -img {
719 - border: none;
720 - vertical-align: middle;
721 -}
722 -hr {
723 - height: 1px;
724 - color: #aaa;
725 - background-color: #aaa;
726 - border: 0;
727 - margin: .2em 0 .2em 0;
728 -}
729 -
730 -/* Structural Elements */
731 -h1,
732 -h2,
733 -h3,
734 -h4,
735 -h5,
736 -h6 {
737 - color: black;
738 - background: none;
739 - font-weight: normal;
740 - margin: 0;
741 - overflow: hidden;
742 - padding-top: .5em;
743 - padding-bottom: .17em;
744 - border-bottom: 1px solid #aaa;
745 - width: auto;
746 -}
747 -h1 { font-size: 188%; }
748 -h1 .editsection { font-size: 53%; }
749 -h2 { font-size: 150%; }
750 -h2 .editsection { font-size: 67%; }
751 -h3,
752 -h4,
753 -h5,
754 -h6 {
755 - border-bottom: none;
756 - font-weight: bold;
757 -}
758 -h3 { font-size: 132%; }
759 -h3 .editsection { font-size: 76%; font-weight: normal; }
760 -h4 { font-size: 116%; }
761 -h4 .editsection { font-size: 86%; font-weight: normal; }
762 -h5 { font-size: 100%; }
763 -h5 .editsection { font-weight: normal; }
764 -h6 { font-size: 80%; }
765 -h6 .editsection { font-size: 125%; font-weight: normal; }
766693 .editsection { float: right; }
767 -p {
768 - margin: .4em 0 .5em 0;
769 - line-height: 1.5em;
770 -}
771 -p img {
772 - margin: 0;
773 -}
774 -q {
775 - font-family: Times, "Times New Roman", serif;
776 - font-style: italic;
777 -}
778 -/* Disabled for now
779 -blockquote {
780 - font-family: Times, "Times New Roman", serif;
781 - font-style: italic;
782 -}*/
783 -pre, code, tt, kbd, samp {
784 - /*
785 - * It's important for this rule to first reference an actual font name, some browsers will render the monospace text
786 - * too small otherwise, namely Firefox, Chrome and Safari
787 - */
788 - font-family: monospace, "Courier New";
789 -}
790 -code {
791 - background-color: #f9f9f9;
792 -}
 694+
793695 pre {
794 - padding: 1em;
795 - border: 1px dashed #2f6fab;
796 - color: black;
797 - background-color: #f9f9f9;
798696 line-height: 1.3em;
799697 }
800 -ul {
801 - line-height: 1.5em;
802 - list-style-type: square;
803 - margin: .3em 0 0 1.5em;
804 - padding: 0;
805 - /* @embed */
806 - list-style-image: url(images/bullet-icon.png);
807 -}
808 -ol {
809 - line-height: 1.5em;
810 - margin: .3em 0 0 3.2em;
811 - padding: 0;
812 - list-style-image: none;
813 -}
814 -li {
815 - margin-bottom: .1em;
816 -}
817 -dt {
818 - font-weight: bold;
819 - margin-bottom: .1em;
820 -}
821 -dl {
822 - margin-top: .2em;
823 - margin-bottom: .5em;
824 -}
825 -dd {
826 - line-height: 1.5em;
827 - margin-left: 2em;
828 - margin-bottom: .1em;
829 -}
830 -/* Tables */
831 -table {
832 - font-size: 100%;
833 -}
834 -/* Forms */
835 -fieldset {
836 - border: 1px solid #2f6fab;
837 - margin: 1em 0 1em 0;
838 - padding: 0 1em 1em;
839 - line-height: 1.5em;
840 -}
841 - fieldset.nested {
842 - margin: 0 0 0.5em 0;
843 - padding: 0 0.5em 0.5em;
844 - }
845 -legend {
846 - padding: .5em;
847 - font-size: 95%;
848 -}
849 -form {
850 - border: none;
851 - margin: 0;
852 -}
853 -textarea {
854 - width: 100%;
855 - padding: .1em;
856 -}
857 -select {
858 - vertical-align: top;
859 -}
860 -/* Table of Contents */
861 -#toc,
862 -.toc,
863 -.mw-warning {
864 - border: 1px solid #aaa;
865 - background-color: #f9f9f9;
866 - padding: 5px;
867 - font-size: 95%;
868 -}
869 -#toc h2,
870 -.toc h2 {
871 - display: inline;
872 - border: none;
873 - padding: 0;
874 - font-size: 100%;
875 - font-weight: bold;
876 -}
877 -#toc #toctitle,
878 -.toc #toctitle,
879 -#toc .toctitle,
880 -.toc .toctitle {
881 - text-align: center;
882 -}
883 -#toc ul,
884 -.toc ul {
885 - list-style-type: none;
886 - list-style-image: none;
887 - margin-left: 0;
888 - padding-left: 0;
889 - text-align: left;
890 -}
891 -#toc ul ul,
892 -.toc ul ul {
893 - margin: 0 0 0 2em;
894 -}
895 -#toc .toctoggle,
896 -.toc .toctoggle {
897 - font-size: 94%;
898 -}
899 -/* Images */
900 -/* @noflip */div.floatright, table.floatright {
901 - margin: 0 0 .5em .5em;
902 - border: 0;
903 -}
904 -div.floatright p { font-style: italic; }
905 -/* @noflip */div.floatleft, table.floatleft {
906 - margin: 0 .5em .5em 0;
907 - border: 0;
908 -}
909 -div.floatleft p { font-style: italic; }
910 -/* Thumbnails */
911 -div.thumb {
912 - margin-bottom: .5em;
913 - width: auto;
914 - background-color: transparent;
915 -}
916 -div.thumbinner {
917 - border: 1px solid #ccc;
918 - padding: 3px !important;
919 - background-color: #f9f9f9;
920 - font-size: 94%;
921 - text-align: center;
922 - overflow: hidden;
923 -}
924 -html .thumbimage {
925 - border: 1px solid #ccc;
926 -}
927 -html .thumbcaption {
928 - border: none;
929 - text-align: left;
930 - line-height: 1.4em;
931 - padding: 3px !important;
932 - font-size: 94%;
933 -}
934 -div.magnify {
935 - float: right;
936 - border: none !important;
937 - background: none !important;
938 -}
939 -div.magnify a, div.magnify img {
940 - display: block;
941 - border: none !important;
942 - background: none !important;
943 -}
944 -/* @noflip */div.tright {
945 - margin: .5em 0 1.3em 1.4em;
946 -}
947 -/* @noflip */div.tleft {
948 - margin: .5em 1.4em 1.3em 0;
949 -}
950 -img.thumbborder {
951 - border: 1px solid #dddddd;
952 -}
953 -/* Warning */
954 -.mw-warning {
955 - margin-left: 50px;
956 - margin-right: 50px;
957 - text-align: center;
958 -}
959 -/* User Message */
960 -.usermessage {
961 - background-color: #ffce7b;
962 - border: 1px solid #ffa500;
963 - color: black;
964 - font-weight: bold;
965 - margin: 2em 0 1em;
966 - padding: .5em 1em;
967 - vertical-align: middle;
968 -}
 698+
969699 /* Site Notice (includes notices from CentralNotice extension) */
970700 #siteNotice {
971701 position: relative;
@@ -975,47 +705,6 @@
976706 #localNotice {
977707 margin-bottom: 0.9em;
978708 }
979 -/* Categories */
980 -.catlinks {
981 - border: 1px solid #aaa;
982 - background-color: #f9f9f9;
983 - padding: 5px;
984 - margin-top: 1em;
985 - clear: both;
986 -}
987 -/* Sub-navigation */
988 -#siteSub {
989 - display: none;
990 -}
991 -#jump-to-nav {
992 - display: none;
993 -}
994 -#contentSub, #contentSub2 {
995 - font-size: 84%;
996 - line-height: 1.2em;
997 - margin: 0 0 1.4em 1em;
998 - color: #7d7d7d;
999 - width: auto;
1000 -}
1001 -span.subpages {
1002 - display: block;
1003 -}
1004 -/* Emulate Center */
1005 -.center {
1006 - width: 100%;
1007 - text-align: center;
1008 -}
1009 -*.center * {
1010 - margin-left: auto;
1011 - margin-right: auto;
1012 -}
1013 -/* Small for tables and similar */
1014 -.small {
1015 - font-size: 94%;
1016 -}
1017 -table.small {
1018 - font-size: 100%;
1019 -}
1020709 /* Edge Cases for Content */
1021710 h1, h2 {
1022711 margin-bottom: .6em;
@@ -1099,33 +788,6 @@
1100789 padding-right: 13px;
1101790 }
1102791
1103 -/* Interwiki Styling */
1104 -div#content a.extiw,
1105 -div#content a.extiw:active {
1106 - color: #59e;
1107 - /* Don't show icons for interwiki links */
1108 - background: none;
1109 - padding: 0;
1110 -}
1111 -div#content a.extiw:visited {
1112 - color: #636;
1113 -}
1114 -div#content a.extiw:active {
1115 - color: #b63;
1116 -}
1117 -
1118 -/* External links */
1119 -div#content a.external {
1120 - color: #59e;
1121 -}
1122 -div#content a.external:visited {
1123 - color: #636; /* bug 3112 */
1124 -}
1125 -div#content a.external:active {
1126 - color: #b63;
1127 -}
1128 -
1129 -
1130792 div#content .printfooter {
1131793 display: none;
1132794 }
@@ -1147,12 +809,6 @@
1148810 vertical-align: text-bottom;
1149811 }
1150812
1151 -.toccolours {
1152 - border: 1px solid #aaa;
1153 - background-color: #f9f9f9;
1154 - padding: 5px;
1155 - font-size: 95%;
1156 -}
1157813 #bodyContent {
1158814 position: relative;
1159815 width: 100%;
Index: trunk/phase3/skins/MonoBook.php
@@ -79,7 +79,7 @@
8080 <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
8181
8282 <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
83 - <div id="bodyContent">
 83+ <div id="bodyContent" class="mw-body">
8484 <div id="siteSub"><?php $this->msg('tagline') ?></div>
8585 <div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div>
8686 <?php if($this->data['undelete']) { ?>
Index: trunk/phase3/resources/Resources.php
@@ -16,13 +16,21 @@
1717 /* Skins */
1818
1919 'skins.vector' => array(
20 - 'styles' => array( 'vector/screen.css' => array( 'media' => 'screen' ) ),
 20+ 'styles' => array(
 21+ 'common/commonElements.css' => array( 'media' => 'screen' ),
 22+ 'common/commonContent.css' => array( 'media' => 'screen' ),
 23+ 'common/commonInterface.css' => array( 'media' => 'screen' ),
 24+ 'vector/screen.css' => array( 'media' => 'screen' ),
 25+ ),
2126 'scripts' => 'vector/vector.js',
2227 'remoteBasePath' => $GLOBALS['wgStylePath'],
2328 'localBasePath' => $GLOBALS['wgStyleDirectory'],
2429 ),
2530 'skins.monobook' => array(
2631 'styles' => array(
 32+ 'common/commonElements.css' => array( 'media' => 'screen' ),
 33+ 'common/commonContent.css' => array( 'media' => 'screen' ),
 34+ 'common/commonInterface.css' => array( 'media' => 'screen' ),
2735 'monobook/main.css' => array( 'media' => 'screen' ),
2836 ),
2937 'remoteBasePath' => $GLOBALS['wgStylePath'],

Follow-up revisions

RevisionCommit summaryAuthorDate
r95838Followup r95837; Return the list-style-image for ul{} back to vector since I ...dantman07:03, 31 August 2011
r96849REL1_18: r96509, r96522, r96606, r96643, r96645, r96655, r96659, r96687, r967......reedy15:03, 12 September 2011

Comments

#Comment by Nikerabbit (talk | contribs)   12:59, 31 August 2011

Could you clarify what is the difference between Content and Element?

#Comment by Dantman (talk | contribs)   13:06, 31 August 2011

element = styles for basic elements: links, lists, etc... content = styles for complex things which are a standard part of page content (ie: the css classing is built into the system) like the TOC interface = styles for the monobook/vector pattern of laying out common interfaces, these id/classes's are not built into the system and are outputted by the actual MonoBook/Vector code by convention

Different 3rd party skins may want different levels of these. A skin that wants the typical content area but doesn't want the MonoBook/Vector patterns would just want element content. A skin that wants the basic links, headers, lists, etc... but doesn't want styles for the complex things built into the system would just want element.

#Comment by Dantman (talk | contribs)   13:07, 31 August 2011

And there goes my list:

  • element = styles for basic elements: links, lists, etc...
  • content = styles for complex things which are a standard part of page content (ie: the css classing is built into the system) like the TOC
  • interface = styles for the monobook/vector pattern of laying out common interfaces, these id/classes's are not built into the system and are outputted by the actual MonoBook/Vector code by convention
#Comment by Krinkle (talk | contribs)   22:54, 31 August 2011
/* External links */
+.mw-body a.external {
+	color: #59e;
+}

Result: http://i.imgur.com/g9zZl.png

That bright blue is way too bright and was introduced in this revision as the (implicit) default for Vector. That has to be reverted.

#Comment by Dantman (talk | contribs)   23:12, 31 August 2011

That was r95830. Should I revert it for both external and interwiki, or just external?

#Comment by Krinkle (talk | contribs)   23:15, 31 August 2011

Moving discussion to r95830.

Status & tagging log