From: jrobson Date: Wed, 16 Oct 2013 17:56:34 +0000 (-0700) Subject: Move Vector's preferences css out of screen.less X-Git-Tag: 1.31.0-rc.0~18351^2 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=82dabeb96cb09e7b6ea4784ae4bff5815651c56e;p=lhc%2Fweb%2Fwiklou.git Move Vector's preferences css out of screen.less * Move the preferences styling out of screen.less, no need to penalise all our users with it. * Limited to Vector skin for time being as other skins do not play nicely with these styles. Change-Id: I121b3d88945d994c9e30d96bab7548c839510276 --- diff --git a/resources/Resources.php b/resources/Resources.php index ec6c71b852..8809227dc2 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1011,6 +1011,9 @@ return array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js', 'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css', 'position' => 'top', + 'skinStyles' => array( + 'vector' => 'skins/vector/special.preferences.less', + ), ), 'mediawiki.special.recentchanges' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js', diff --git a/skins/vector/images/preferences-break.png b/skins/vector/images/preferences-break.png deleted file mode 100644 index b5293082d0..0000000000 Binary files a/skins/vector/images/preferences-break.png and /dev/null differ diff --git a/skins/vector/images/preferences-fade.png b/skins/vector/images/preferences-fade.png deleted file mode 100644 index 638084dc26..0000000000 Binary files a/skins/vector/images/preferences-fade.png and /dev/null differ diff --git a/skins/vector/images/preferences/break.png b/skins/vector/images/preferences/break.png new file mode 100644 index 0000000000..b5293082d0 Binary files /dev/null and b/skins/vector/images/preferences/break.png differ diff --git a/skins/vector/images/preferences/fade.png b/skins/vector/images/preferences/fade.png new file mode 100644 index 0000000000..638084dc26 Binary files /dev/null and b/skins/vector/images/preferences/fade.png differ diff --git a/skins/vector/screen.less b/skins/vector/screen.less index de5fd18feb..a882732890 100644 --- a/skins/vector/screen.less +++ b/skins/vector/screen.less @@ -547,104 +547,6 @@ div#footer #footer-places li { text-decoration: none; } -/* - * - * The following code is highly modified from monobook. It would be nice if the - * preftoc id was more human readable like preferences-toc for instance, - * howerver this would require backporting the other skins. - */ - -/* Preferences */ -#preftoc { - /* Tabs */ - width: 100%; - float: left; - clear: both; - margin: 0 !important; - padding: 0 !important; - .background-image('images/preferences-break.png'); - background-position: bottom left; - background-repeat: no-repeat; -} - #preftoc li { - /* Tab */ - float: left; - margin: 0; - padding: 0; - padding-right: 1px; - height: 2.25em; - white-space: nowrap; - list-style-type: none; - list-style-image: none; - .background-image('images/preferences-break.png'); - background-position: bottom right; - background-repeat: no-repeat; - } - /* Sadly, IE6 won't understand this */ - #preftoc li:first-child { - margin-left: 1px; - } - #preftoc a, - #preftoc a:active { - display: inline-block; - position: relative; - color: @menu-link-color; - padding: 0.5em; - text-decoration: none; - background-image: none; - font-size: 0.9em; - } - #preftoc a:hover, - #preftoc a:focus { - text-decoration: underline; - } - #preftoc li.selected a { - .background-image('images/preferences-fade.png'); - background-position: bottom; - background-repeat: repeat-x; - color: #333; - text-decoration: none; - } -#preferences { - float: left; - width: 100%; - margin: 0; - margin-top: -2px; - clear: both; - border: solid 1px #ccc; - background-color: #fafafa; -} -#preferences fieldset { - border: none; - border-top: solid 1px #ccc; -} -#preferences fieldset.prefsection { - border: none; - padding: 0; - margin: 1em; -} -#preferences legend { - color: #666; -} -#preferences fieldset.prefsection legend.mainLegend { - display: none; -} -#preferences td { - padding-left: 0.5em; - padding-right: 0.5em; -} -.htmlform-tip { - font-size: x-small; - padding: .2em 2em; - color: #666; -} -#preferences div.mw-prefs-buttons { - padding: 1em; -} -#preferences div.mw-prefs-buttons input { - margin-right: 0.25em; -} - ul { list-style-type: disc; .list-style-image('images/bullet-icon.png'); diff --git a/skins/vector/special.preferences.less b/skins/vector/special.preferences.less new file mode 100644 index 0000000000..202c877a17 --- /dev/null +++ b/skins/vector/special.preferences.less @@ -0,0 +1,99 @@ +@import "mediawiki.mixins"; +@import "variables"; + +/** + * The following code is highly modified from monobook. It would be nice if the + * preftoc id was more human readable like preferences-toc for instance, + * howerver this would require backporting the other skins. + */ + +/* Preferences */ +#preftoc { + /* Tabs */ + width: 100%; + float: left; + clear: both; + margin: 0 !important; + padding: 0 !important; + .background-image('images/preferences/break.png'); + background-position: bottom left; + background-repeat: no-repeat; +} + #preftoc li { + /* Tab */ + float: left; + margin: 0; + padding: 0; + padding-right: 1px; + height: 2.25em; + white-space: nowrap; + list-style-type: none; + list-style-image: none; + .background-image('images/preferences/break.png'); + background-position: bottom right; + background-repeat: no-repeat; + } + /* Sadly, IE6 won't understand this */ + #preftoc li:first-child { + margin-left: 1px; + } + #preftoc a, + #preftoc a:active { + display: inline-block; + position: relative; + color: @menu-link-color; + padding: 0.5em; + text-decoration: none; + background-image: none; + font-size: 0.9em; + } + #preftoc a:hover, + #preftoc a:focus { + text-decoration: underline; + } + #preftoc li.selected a { + .background-image('images/preferences/fade.png'); + background-position: bottom; + background-repeat: repeat-x; + color: #333; + text-decoration: none; + } +#preferences { + float: left; + width: 100%; + margin: 0; + margin-top: -2px; + clear: both; + border: solid 1px #ccc; + background-color: #fafafa; +} +#preferences fieldset { + border: none; + border-top: solid 1px #ccc; +} +#preferences fieldset.prefsection { + border: none; + padding: 0; + margin: 1em; +} +#preferences legend { + color: #666; +} +#preferences fieldset.prefsection legend.mainLegend { + display: none; +} +#preferences td { + padding-left: 0.5em; + padding-right: 0.5em; +} +.htmlform-tip { + font-size: x-small; + padding: .2em 2em; + color: #666; +} +#preferences div.mw-prefs-buttons { + padding: 1em; +} +#preferences div.mw-prefs-buttons input { + margin-right: 0.25em; +}