From cbe1910f8719fd01ca902810ae9ab73b1256549a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 8 Feb 2016 12:57:47 +0000 Subject: [PATCH] Revert "TableSorter: Avoid FOUC and preserve styling in VisualEditor" That was, unfortunately, way too optimistic. The logic for choosing header cells that are used for sorting is a lot more complicated than current CSS selectors can express. This reverts commit 9e363d0e8a12f4fc205de08958622d6e8e250c81. Bug: T126007 Change-Id: I7c08e06a4f61d69b6858958218d9a6233aee18de --- resources/src/jquery/jquery.tablesorter.less | 9 ++++----- resources/src/mediawiki.skinning/content.css | 13 ------------- .../images/sort_both_readonly.png | Bin 230 -> 0 bytes .../images/sort_both_readonly.svg | 4 ---- 4 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 resources/src/mediawiki.skinning/images/sort_both_readonly.png delete mode 100644 resources/src/mediawiki.skinning/images/sort_both_readonly.svg diff --git a/resources/src/jquery/jquery.tablesorter.less b/resources/src/jquery/jquery.tablesorter.less index 85c58d745c..f4ef540954 100644 --- a/resources/src/jquery/jquery.tablesorter.less +++ b/resources/src/jquery/jquery.tablesorter.less @@ -1,20 +1,19 @@ @import "mediawiki.mixins"; -// Table Sorting +/* Table Sorting */ -.client-js table.jquery-tablesorter th.headerSort { +table.jquery-tablesorter th.headerSort { .background-image-svg( 'images/sort_both.svg', 'images/sort_both.png' ); cursor: pointer; - // Keep synchronized with mediawiki.skinning.content styles background-repeat: no-repeat; background-position: center right; padding-right: 21px; } -.client-js table.jquery-tablesorter th.headerSortUp { +table.jquery-tablesorter th.headerSortUp { .background-image-svg( 'images/sort_up.svg', 'images/sort_up.png' ); } -.client-js table.jquery-tablesorter th.headerSortDown { +table.jquery-tablesorter th.headerSortDown { .background-image-svg( 'images/sort_down.svg', 'images/sort_down.png' ); } diff --git a/resources/src/mediawiki.skinning/content.css b/resources/src/mediawiki.skinning/content.css index a873cdfae4..c88d00dd8b 100644 --- a/resources/src/mediawiki.skinning/content.css +++ b/resources/src/mediawiki.skinning/content.css @@ -241,16 +241,3 @@ div.tright { div.tleft { margin: .5em 1.4em 1.3em 0; } - -/* Make space for the jquery.tablesorter icon and display a placeholder if JavaScript is loaded, while - tablesorter is still loading and setting up the tables for sorting. This avoids a flash of - unstyled content during page load (FOUC). The styles can also be used by WYSIWYG editors. */ -.client-js table.sortable th:not(.unsortable) { - background-image: url(images/sort_both_readonly.png); - /* @embed */ - background-image: linear-gradient(transparent, transparent), url(images/sort_both_readonly.svg); - /* Keep synchronised with jquery.tablesorter styles */ - background-repeat: no-repeat; - background-position: center right; - padding-right: 21px; -} diff --git a/resources/src/mediawiki.skinning/images/sort_both_readonly.png b/resources/src/mediawiki.skinning/images/sort_both_readonly.png deleted file mode 100644 index bdb09e3d52312ccf0583cd4a8dc4ac3be9386779..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^qCm{a!3HGnGN+dTDVAa<&kznEsNqQI07({jL>2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4*gH U+ULi8K - - - -- 2.20.1