From 33d736d0f2f0d66b979130270bbca9703267b412 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Sun, 1 Nov 2015 01:38:33 +0100 Subject: [PATCH] Rework Vector style of Preferences to prevent FOUC Depends on: I24d9b16 Bug: T115692 Change-Id: I59f0f4538132e60a457c5c93139c04fff24fd2b2 --- skin.json | 2 +- ...mediawiki.special.preferences.styles.less} | 24 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) rename skinStyles/{mediawiki.special.preferences.less => mediawiki.special.preferences.styles.less} (88%) diff --git a/skin.json b/skin.json index cbd5912..0e4f4cb 100644 --- a/skin.json +++ b/skin.json @@ -89,7 +89,7 @@ "+mediawiki.sectionAnchor": "skinStyles/mediawiki.sectionAnchor.less", "ooui": "skinStyles/ooui.less", "mediawiki.special": "skinStyles/mediawiki.special.less", - "mediawiki.special.preferences": "skinStyles/mediawiki.special.preferences.less" + "+mediawiki.special.preferences.styles": "skinStyles/mediawiki.special.preferences.styles.less" } }, "config": { diff --git a/skinStyles/mediawiki.special.preferences.less b/skinStyles/mediawiki.special.preferences.styles.less similarity index 88% rename from skinStyles/mediawiki.special.preferences.less rename to skinStyles/mediawiki.special.preferences.styles.less index c463718..988b858 100644 --- a/skinStyles/mediawiki.special.preferences.less +++ b/skinStyles/mediawiki.special.preferences.styles.less @@ -6,14 +6,13 @@ * preftoc id was more human readable like preferences-toc for instance, * howerver this would require backporting the other skins. */ - -#preftoc { +.client-js #preftoc { /* Tabs */ width: 100%; float: left; clear: both; - margin: 0 !important; - padding: 0 !important; + margin: 0; + padding: 0; .background-image('../images/preferences/break.png'); background-position: bottom left; background-repeat: no-repeat; @@ -43,7 +42,6 @@ background-position: bottom; background-repeat: repeat-x; color: #333; - text-decoration: none; } } } @@ -65,7 +63,7 @@ } } -#preferences { +.client-js #preferences { float: left; width: 100%; margin: 0; @@ -77,15 +75,15 @@ fieldset { border: none; border-top: solid 1px #ccc; + } - &.prefsection { - border: none; - padding: 0; - margin: 1em; + >fieldset { + border: none; + padding: 0; + margin: 1em; - legend.mainLegend { - display: none; - } + >legend { + display: none; } }