r103156 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103155‎ | r103156 | r103157 >
Date:12:47, 15 November 2011
Author:reedy
Status:ok
Tags:
Comment:
REL1_18 Merge r99307 cleanly after r103155
Modified paths:
  • /branches/REL1_18/phase3 (modified) (history)
  • /branches/REL1_18/phase3/resources/jquery/jquery.tablesorter.css (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/resources/jquery/jquery.tablesorter.css
@@ -1,17 +1,17 @@
22 /* Table Sorting */
33 table.jquery-tablesorter th.headerSort {
44 /* @embed */
5 - background-image: url(images/sort_both.gif);
 5+ background-image: url(images/sort_both.gif) !important;
66 cursor: pointer;
7 - background-repeat: no-repeat;
8 - background-position: center right;
9 - padding-right: 21px;
 7+ background-repeat: no-repeat !important;
 8+ background-position: center right !important;
 9+ padding-right: 21px !important;
1010 }
1111 table.jquery-tablesorter th.headerSortUp {
1212 /* @embed */
13 - background-image: url(images/sort_up.gif);
 13+ background-image: url(images/sort_up.gif) !important;
1414 }
1515 table.jquery-tablesorter th.headerSortDown {
1616 /* @embed */
17 - background-image: url(images/sort_down.gif);
 17+ background-image: url(images/sort_down.gif) !important;
1818 }
Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
1919 Merged /trunk/phase3:r99307

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r99307Add !important to the tablesorter indicator....hartman12:59, 8 October 2011
r103155Swap spaces to tabs (creates irritating merge conflicts for r99307)reedy12:45, 15 November 2011

Status & tagging log