From 59c45c2b6dd07cba2e6be6e758056bee7ae6b9f2 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Thu, 11 Oct 2018 14:38:07 +0100
Subject: [PATCH] Reduce specificity of wikitable overrides

Bug: T205945
Change-Id: I88d5b9699661005144f3eebc804438afaae373aa
---
 .../skins.minerva.content.styles/tables.less  | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/resources/skins.minerva.content.styles/tables.less b/resources/skins.minerva.content.styles/tables.less
index b2f45198f..94bbe09ff 100644
--- a/resources/skins.minerva.content.styles/tables.less
+++ b/resources/skins.minerva.content.styles/tables.less
@@ -33,31 +33,33 @@
 		caption {
 			text-align: left;
 		}
-
-		// For skinning normal data tables
-		// Compare with mediawiki.legacy/shared.css
-		&.wikitable {
-			border: 1px solid @colorGray5;
-			// Note older browsers will fall back to @grayLight
-			border-color: fade( @colorGray5, 30 );
-
-			// We only style cells that are direct children of the wikitable table since
-			// table tags may be used for non-table purposes within the cells.
-			> tr > th,
-			> tr > td,
-			> * > tr > th,
-			> * > tr > td {
-				border: 1px solid @colorGray5;
-				// Note older browsers will fall back to @grayLight
-				border-color: fade( @colorGray5, 30 );
-				padding: 0.2em;
-			}
-
-			// Make headings distinguishable
-			> tr > th,
-			> * > tr > th {
-				background-color: @grayLightest;
-			}
-		}
+	}
+}
+
+// For skinning normal data tables
+// Compare with mediawiki.legacy/shared.css
+// Move out of .content selector to avoid increased
+// specificty conflicts e.g. with tablesorter (T205945)
+table.wikitable {
+	border: 1px solid @colorGray5;
+	// Note older browsers will fall back to @grayLight
+	border-color: fade( @colorGray5, 30 );
+
+	// We only style cells that are direct children of the wikitable table since
+	// table tags may be used for non-table purposes within the cells.
+	> tr > th,
+	> tr > td,
+	> * > tr > th,
+	> * > tr > td {
+		border: 1px solid @colorGray5;
+		// Note older browsers will fall back to @grayLight
+		border-color: fade( @colorGray5, 30 );
+		padding: 0.2em;
+	}
+
+	// Make headings distinguishable
+	> tr > th,
+	> * > tr > th {
+		background-color: @grayLightest;
 	}
 }