Merge "Revert "TableSorter: Avoid FOUC and preserve styling in VisualEditor""

diff --git a/resources/src/jquery/jquery.tablesorter.less b/resources/src/jquery/jquery.tablesorter.less
index 85c58d7..f4ef540 100644 (file)
--- 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 a873cdf..c88d00d 100644 (file)
--- 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 (file)
index bdb09e3..0000000
Binary files a/resources/src/mediawiki.skinning/images/sort_both_readonly.png and /dev/null differ

diff --git a/resources/src/mediawiki.skinning/images/sort_both_readonly.svg b/resources/src/mediawiki.skinning/images/sort_both_readonly.svg
deleted file mode 100644 (file)
index 3b97000..0000000
--- a/resources/src/mediawiki.skinning/images/sort_both_readonly.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 9" height="9" width="21">
-    <path d="M14.5 5l-4 4-4-4zM14.5 4l-4-4-4 4z" style="fill-opacity: 0.5;"/>
-</svg>