r96762 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96761‎ | r96762 | r96763 >
Date:00:13, 11 September 2011
Author:robin
Status:ok (Comments)
Tags:
Comment:
Do r93269 in a better way (also fixes some rare cases). Use 'margin/padding' instead of 'margin-left/padding-left' so it doesn't have to rely on the direction.
Modified paths:
  • /trunk/phase3/skins/chick/main.css (modified) (history)
  • /trunk/phase3/skins/common/commonContent.css (modified) (history)
  • /trunk/phase3/skins/common/oldshared.css (modified) (history)
  • /trunk/phase3/skins/common/shared.css (modified) (history)
  • /trunk/phase3/skins/modern/main.css (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/chick/main.css
@@ -245,7 +245,7 @@
246246 padding:5px;
247247 font-size: 95%;
248248 }
249 -#toc ul { margin-left: 2em; }
 249+#toc ul { margin: 0 2em; }
250250 #toc .toctoggle { font-size: 94%; }
251251 #toc .editsection {
252252 margin-top: 0.7em;
Index: trunk/phase3/skins/modern/main.css
@@ -587,17 +587,10 @@
588588 list-style-type: none;
589589 list-style-image: none;
590590 margin: 0 1em 0 1em;
591 - padding-left: 0;
 591+ padding: 0;
592592 text-align: left;
593593 }
594594
595 -.mw-content-ltr .toc ul,
596 -.mw-content-rtl .toc ul,
597 -.mw-content-ltr #toc ul,
598 -.mw-content-rtl #toc ul {
599 - margin: 0 1em;
600 -}
601 -
602595 #toc ul ul,
603596 .toc ul ul {
604597 margin: 0 0 0 2em;
Index: trunk/phase3/skins/common/oldshared.css
@@ -147,8 +147,7 @@
148148 .toc ul {
149149 list-style-type: none;
150150 list-style-image: none;
151 - margin-left: 0;
152 - padding-left: 0;
 151+ padding: 0;
153152 text-align: left;
154153 }
155154 #toc ul ul,
Index: trunk/phase3/skins/common/shared.css
@@ -821,20 +821,22 @@
822822 list-style-type: oriya;
823823 }
824824
 825+#toc ul, .toc ul {
 826+ margin: .3em 0;
 827+}
 828+
825829 /* Correct directionality when page dir is different from site/user dir */
826830 /* @noflip */ .mw-content-ltr .toc ul,
827831 .mw-content-ltr #toc ul,
828832 .mw-content-rtl .mw-content-ltr .toc ul,
829833 .mw-content-rtl .mw-content-ltr #toc ul {
830834 text-align: left;
831 - margin-left: 0;
832835 }
833836 /* @noflip */ .mw-content-rtl .toc ul,
834837 .mw-content-rtl #toc ul,
835838 .mw-content-ltr .mw-content-rtl .toc ul,
836839 .mw-content-ltr .mw-content-rtl #toc ul {
837840 text-align: right;
838 - margin-right: 0;
839841 }
840842 /* @noflip */ .mw-content-ltr .toc ul ul,
841843 .mw-content-ltr #toc ul ul,
Index: trunk/phase3/skins/common/commonContent.css
@@ -30,7 +30,7 @@
3131 list-style-type: none;
3232 list-style-image: none;
3333 margin-left: 0;
34 - padding-left: 0;
 34+ padding: 0;
3535 text-align: left;
3636 }
3737 #toc ul ul,

Follow-up revisions

RevisionCommit summaryAuthorDate
r96849REL1_18: r96509, r96522, r96606, r96643, r96645, r96655, r96659, r96687, r967......reedy15:03, 12 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r93269Fix toc margin in modern skin per DieBuche on r90743robin14:38, 27 July 2011

Comments

#Comment by Krinkle (talk | contribs)   00:24, 11 September 2011

Nice. Looks like the 'modern' skin did this a lot better than the other skins (assuming that's where the idea came from). Looks good, marking OK.

Status & tagging log