r112836 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r112835‎ | r112836 | r112837 >
Date:21:27, 1 March 2012
Author:tparscal
Status:ok (Comments)
Tags:
Comment:
Resolves bug #11374 and improves on r94429, r94461, r101147, r105280, r106884, r107127, r108975 and r109932 which were reverted by r112750.
Modified paths:
  • /trunk/phase3/resources/mediawiki.action/mediawiki.action.history.diff.css (modified) (history)

Diff [purge]

Index: trunk/phase3/resources/mediawiki.action/mediawiki.action.history.diff.css
@@ -4,33 +4,48 @@
55 table.diff, td.diff-otitle, td.diff-ntitle {
66 background-color: white;
77 }
 8+
89 td.diff-otitle,
910 td.diff-ntitle {
1011 text-align: center;
1112 }
 13+
1214 td.diff-marker {
1315 text-align: right;
 16+ font-weight: bold;
 17+ font-size: 1.25em;
1418 }
 19+
1520 td.diff-lineno {
1621 font-weight: bold;
1722 }
 23+
 24+td.diff-addedline,
 25+td.diff-deletedline,
 26+td.diff-context {
 27+ font-size: 88%;
 28+ vertical-align: top;
 29+ white-space: -moz-pre-wrap;
 30+ white-space: pre-wrap;
 31+}
 32+
1833 td.diff-addedline {
19 - background: #cfc;
20 - font-size: smaller;
 34+ border: solid 4px #a3d3ff;
 35+ border-radius: 0.33em;
2136 }
 37+
2238 td.diff-deletedline {
23 - background: #ffa;
24 - font-size: smaller;
 39+ border: solid 4px #ffe49c;
 40+ border-radius: 0.33em;
2541 }
 42+
2643 td.diff-context {
27 - background: #eee;
28 - font-size: smaller;
 44+ background: #F2F2F2;
 45+ color: #333333;
2946 }
 47+
3048 .diffchange {
31 - color: red;
3249 font-weight: bold;
33 - white-space: -moz-pre-wrap;
34 - white-space: pre-wrap;
3550 text-decoration: none;
3651 }
3752
@@ -42,20 +57,39 @@
4358 /* Ensure that colums are of equal width */
4459 table-layout: fixed;
4560 }
 61+
 62+td.diff-addedline .diffchange {
 63+ background: #eaf5ff;
 64+ padding: 0.125em 0.25em;
 65+ border: solid 1px #5698d6;
 66+ border-radius: 0.33em;
 67+}
 68+
 69+td.diff-deletedline .diffchange {
 70+ background: #feeec8;
 71+ padding: 0.125em 0.25em;
 72+ border: solid 1px #e0b141;
 73+ border-radius: 0.33em;
 74+}
 75+
4676 table.diff td {
47 - padding: 0;
 77+ padding: 0.33em 0.66em;
4878 }
 79+
4980 table.diff col.diff-marker {
5081 width: 2%;
5182 }
 83+
5284 table.diff col.diff-content {
5385 width: 48%;
5486 }
 87+
5588 table.diff td div {
5689 /* Force-wrap very long lines such as URLs or page-widening char strings.*/
5790 word-wrap: break-word;
5891
5992 /* As fallback (FF<3.5, Opera <10.5), scrollbars will be added for very wide cells
60 - instead of text overflowing or widening */
 93+ instead of text overflowing or widening
 94+ */
6195 overflow: auto;
6296 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r112853Improves on r112836 by only using borders on the left and right of the change...tparscal00:07, 2 March 2012
r113071Further refinements for r112836 and r112853....tparscal19:46, 5 March 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r94429(bug 11374) Red .diffchange text in the green 'added' area may be hard to rea...maxsem20:57, 13 August 2011
r94461Fix r94429 : Left and right side are still nearly the same color for 7% of th...diebuche14:40, 14 August 2011
r101147* use outline instead of border to not change the dimensions of the elementdanny_b16:15, 28 October 2011
r105280Diff colors now use the french Wikipedia scheme...hashar09:41, 6 December 2011
r106884Followup r105280...bharris22:53, 20 December 2011
r107127Applying patch from bug 33335 (from Erwin Dokter). Followup to r105280...robla00:22, 23 December 2011
r108975[mediawiki.action.history.diff.css] remove redundant css rule...krinkle13:56, 15 January 2012
r109932diff: align cell content to the top...hashar16:25, 24 January 2012
r112750[mediawiki.action.history.diff.css] Revert 1.19 style changes back to how it ...krinkle01:07, 1 March 2012

Comments

#Comment by Danny B. (talk | contribs)   21:41, 1 March 2012

Why do we use border again when it was problematic and thus replaced in r101147 by outline which does not have influence on element's dimensions?

#Comment by MaxSem (talk | contribs)   21:41, 1 March 2012

As the instigator of all this epic, I mostly approve this change, but I have a couple of objections.

#Comment by Trevor Parscal (WMF) (talk | contribs)   23:57, 1 March 2012

If we added a CSS class to empty lines we could resolve this.

#Comment by Nikerabbit (talk | contribs)   10:30, 2 March 2012

I have objections too, please don't use imageshack. Could barely get rid of the spams and scams taking over my browser.

#Comment by MaxSem (talk | contribs)   10:35, 2 March 2012

You use unpatched IE 6? ;]

#Comment by He7d3r (talk | contribs)   22:07, 1 March 2012

In case this is kept, it needs to be copied to includes/FeedUtils.php (see bugzilla:34798)

Status & tagging log