From 9e04988714fdd19efd1835dd730d875fd8e615dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 22 Jul 2014 02:41:34 +0200 Subject: [PATCH] Vector: Make better use of $wgResourceModuleSkinStyles MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This gets rid of quite a lot of Vector from Resources.php and resources/. * New $wgResourceModuleSkinStyles entries: * jquery.tipsy: Split off skins/Vector/skinStyles/jquery.tipsy.less from skins/Vector/components/common.less. It's just one rule, but let's do it for consistency anyway. * jquery.ui.*: Converted from Resources.php. Files renamed: resources/src/jquery.ui-themes/vector/** → skins/Vector/skinStyles/jquery.ui/** * mediawiki.notification: Still has the specificity hack, just renamed skins/Vector/components/notifications.less → skins/Vector/skinStyles/mediawiki.notification.less * Updated $wgResourceModuleSkinStyles entries: * mediawiki.special: Renamed file for consistency, skins/Vector/special.less → skins/Vector/skinStyles/mediawiki.special.less * mediawiki.special.preferences: Renamed file for consistency, skins/Vector/special.preferences.less → skins/Vector/skinStyles/mediawiki.special.preferences.less Change-Id: If248781e44300039eb52262d03b2f6722838dd12 --- resources/Resources.php | 14 ------------ skins/Vector/Vector.php | 20 ++++++++++++++++-- skins/Vector/components/common.less | 6 ------ skins/Vector/skinStyles/jquery.tipsy.less | 4 ++++ .../skinStyles/jquery.ui}/images/close.png | Bin .../jquery.ui}/images/titlebar-fade.png | Bin .../jquery.ui}/images/ui-anim_basic_16x16.gif | Bin .../images/ui-bg_flat_15_cd0a0a_40x100.png | Bin .../images/ui-bg_flat_70_000000_40x100.png | Bin .../ui-bg_highlight-hard_100_f2f5f7_1x100.png | Bin .../ui-bg_highlight-hard_80_d7ebf9_1x100.png | Bin .../ui-bg_highlight-soft_100_e4f1fb_1x100.png | Bin .../ui-bg_highlight-soft_100_ffffff_1x100.png | Bin .../ui-bg_highlight-soft_25_ffef8f_1x100.png | Bin .../ui-bg_inset-hard_100_f0f0f0_1x100.png | Bin .../images/ui-icons_2694e8_256x240.png | Bin .../images/ui-icons_2e83ff_256x240.png | Bin .../images/ui-icons_3d80b3_256x240.png | Bin .../images/ui-icons_666666_256x240.png | Bin .../images/ui-icons_72a7cf_256x240.png | Bin .../images/ui-icons_ffffff_256x240.png | Bin .../jquery.ui}/jquery.ui.accordion.css | 0 .../jquery.ui}/jquery.ui.autocomplete.css | 0 .../jquery.ui}/jquery.ui.button.css | 0 .../skinStyles/jquery.ui}/jquery.ui.core.css | 0 .../jquery.ui}/jquery.ui.datepicker.css | 0 .../jquery.ui}/jquery.ui.dialog.css | 0 .../jquery.ui}/jquery.ui.progressbar.css | 0 .../jquery.ui}/jquery.ui.resizable.css | 0 .../jquery.ui}/jquery.ui.selectable.css | 0 .../jquery.ui}/jquery.ui.slider.css | 0 .../skinStyles/jquery.ui}/jquery.ui.tabs.css | 0 .../skinStyles/jquery.ui}/jquery.ui.theme.css | 0 .../mediawiki.notification.less} | 2 ++ .../mediawiki.special.less} | 0 .../mediawiki.special.preferences.less} | 2 +- 36 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 skins/Vector/skinStyles/jquery.tipsy.less rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/close.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/titlebar-fade.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-anim_basic_16x16.gif (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-bg_flat_15_cd0a0a_40x100.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-bg_flat_70_000000_40x100.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-bg_highlight-soft_100_ffffff_1x100.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-bg_highlight-soft_25_ffef8f_1x100.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-bg_inset-hard_100_f0f0f0_1x100.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-icons_2694e8_256x240.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-icons_2e83ff_256x240.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-icons_3d80b3_256x240.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-icons_666666_256x240.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-icons_72a7cf_256x240.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/images/ui-icons_ffffff_256x240.png (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.accordion.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.autocomplete.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.button.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.core.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.datepicker.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.dialog.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.progressbar.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.resizable.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.selectable.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.slider.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.tabs.css (100%) rename {resources/src/jquery.ui-themes/vector => skins/Vector/skinStyles/jquery.ui}/jquery.ui.theme.css (100%) rename skins/Vector/{components/notifications.less => skinStyles/mediawiki.notification.less} (95%) rename skins/Vector/{special.less => skinStyles/mediawiki.special.less} (100%) rename skins/Vector/{special.preferences.less => skinStyles/mediawiki.special.preferences.less} (98%) diff --git a/resources/Resources.php b/resources/Resources.php index 0982b2955b..46a342c74a 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -329,10 +329,6 @@ return array( 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css', 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.theme.css', ), - 'vector' => array( - 'resources/src/jquery.ui-themes/vector/jquery.ui.core.css', - 'resources/src/jquery.ui-themes/vector/jquery.ui.theme.css', - ), ), 'group' => 'jquery.ui', ), @@ -344,7 +340,6 @@ return array( ), 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.accordion.css', ), 'group' => 'jquery.ui', ), @@ -358,7 +353,6 @@ return array( ), 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.autocomplete.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.autocomplete.css', ), 'group' => 'jquery.ui', ), @@ -370,7 +364,6 @@ return array( ), 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.button.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.button.css', ), 'group' => 'jquery.ui', ), @@ -379,7 +372,6 @@ return array( 'dependencies' => 'jquery.ui.core', 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.datepicker.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.datepicker.css', ), 'languageScripts' => array( 'af' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-af.js', @@ -465,7 +457,6 @@ return array( ), 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.dialog.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.dialog.css', ), 'group' => 'jquery.ui', ), @@ -518,7 +509,6 @@ return array( ), 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.progressbar.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.progressbar.css', ), 'group' => 'jquery.ui', ), @@ -531,7 +521,6 @@ return array( ), 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.resizable.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.resizable.css', ), 'group' => 'jquery.ui', ), @@ -544,7 +533,6 @@ return array( ), 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.selectable.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.selectable.css', ), 'group' => 'jquery.ui', ), @@ -557,7 +545,6 @@ return array( ), 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.slider.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.slider.css', ), 'group' => 'jquery.ui', ), @@ -591,7 +578,6 @@ return array( ), 'skinStyles' => array( 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.tabs.css', - 'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.tabs.css', ), 'group' => 'jquery.ui', ), diff --git a/skins/Vector/Vector.php b/skins/Vector/Vector.php index abcc65dcdf..a08d121d05 100644 --- a/skins/Vector/Vector.php +++ b/skins/Vector/Vector.php @@ -65,8 +65,24 @@ $wgResourceModules['skins.vector.js'] = array( // Apply module customizations $wgResourceModuleSkinStyles['vector'] = array( - 'mediawiki.special' => 'special.less', - 'mediawiki.special.preferences' => 'special.preferences.less', + 'jquery.tipsy' => 'skinStyles/jquery.tipsy.less', + 'jquery.ui.core' => array( + 'skinStyles/jquery.ui/jquery.ui.core.css', + 'skinStyles/jquery.ui/jquery.ui.theme.css', + ), + 'jquery.ui.accordion' => 'skinStyles/jquery.ui/jquery.ui.accordion.css', + 'jquery.ui.autocomplete' => 'skinStyles/jquery.ui/jquery.ui.autocomplete.css', + 'jquery.ui.button' => 'skinStyles/jquery.ui/jquery.ui.button.css', + 'jquery.ui.datepicker' => 'skinStyles/jquery.ui/jquery.ui.datepicker.css', + 'jquery.ui.dialog' => 'skinStyles/jquery.ui/jquery.ui.dialog.css', + 'jquery.ui.progressbar' => 'skinStyles/jquery.ui/jquery.ui.progressbar.css', + 'jquery.ui.resizable' => 'skinStyles/jquery.ui/jquery.ui.resizable.css', + 'jquery.ui.selectable' => 'skinStyles/jquery.ui/jquery.ui.selectable.css', + 'jquery.ui.slider' => 'skinStyles/jquery.ui/jquery.ui.slider.css', + 'jquery.ui.tabs' => 'skinStyles/jquery.ui/jquery.ui.tabs.css', + 'mediawiki.notification' => 'skinStyles/mediawiki.notification.less', + 'mediawiki.special' => 'skinStyles/mediawiki.special.less', + 'mediawiki.special.preferences' => 'skinStyles/mediawiki.special.preferences.less', 'remoteSkinPath' => 'Vector', 'localBasePath' => __DIR__, ); diff --git a/skins/Vector/components/common.less b/skins/Vector/components/common.less index 33cd230592..1aee34da2e 100644 --- a/skins/Vector/components/common.less +++ b/skins/Vector/components/common.less @@ -132,9 +132,3 @@ pre, .mw-code { line-height: @content-line-height; font-size: @content-font-size; } - -/* Tooltips are outside of the normal body code, so this helps make the size of the text sensible */ -// FIXME: Should be part of jquery.tipsy.css -.tipsy { - font-size: 0.8em; -} diff --git a/skins/Vector/skinStyles/jquery.tipsy.less b/skins/Vector/skinStyles/jquery.tipsy.less new file mode 100644 index 0000000000..0e0c8ecc2c --- /dev/null +++ b/skins/Vector/skinStyles/jquery.tipsy.less @@ -0,0 +1,4 @@ +/* Tooltips are outside of the normal body code, so this helps make the size of the text sensible */ +.tipsy { + font-size: 0.8em; +} diff --git a/resources/src/jquery.ui-themes/vector/images/close.png b/skins/Vector/skinStyles/jquery.ui/images/close.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/close.png rename to skins/Vector/skinStyles/jquery.ui/images/close.png diff --git a/resources/src/jquery.ui-themes/vector/images/titlebar-fade.png b/skins/Vector/skinStyles/jquery.ui/images/titlebar-fade.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/titlebar-fade.png rename to skins/Vector/skinStyles/jquery.ui/images/titlebar-fade.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-anim_basic_16x16.gif b/skins/Vector/skinStyles/jquery.ui/images/ui-anim_basic_16x16.gif similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-anim_basic_16x16.gif rename to skins/Vector/skinStyles/jquery.ui/images/ui-anim_basic_16x16.gif diff --git a/resources/src/jquery.ui-themes/vector/images/ui-bg_flat_15_cd0a0a_40x100.png b/skins/Vector/skinStyles/jquery.ui/images/ui-bg_flat_15_cd0a0a_40x100.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-bg_flat_15_cd0a0a_40x100.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-bg_flat_15_cd0a0a_40x100.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-bg_flat_70_000000_40x100.png b/skins/Vector/skinStyles/jquery.ui/images/ui-bg_flat_70_000000_40x100.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-bg_flat_70_000000_40x100.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-bg_flat_70_000000_40x100.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png b/skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png b/skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png b/skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-soft_100_ffffff_1x100.png b/skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_ffffff_1x100.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-soft_100_ffffff_1x100.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_ffffff_1x100.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-soft_25_ffef8f_1x100.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-bg_highlight-soft_25_ffef8f_1x100.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-bg_highlight-soft_25_ffef8f_1x100.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-bg_inset-hard_100_f0f0f0_1x100.png b/skins/Vector/skinStyles/jquery.ui/images/ui-bg_inset-hard_100_f0f0f0_1x100.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-bg_inset-hard_100_f0f0f0_1x100.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-bg_inset-hard_100_f0f0f0_1x100.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-icons_2694e8_256x240.png b/skins/Vector/skinStyles/jquery.ui/images/ui-icons_2694e8_256x240.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-icons_2694e8_256x240.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-icons_2694e8_256x240.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-icons_2e83ff_256x240.png b/skins/Vector/skinStyles/jquery.ui/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-icons_2e83ff_256x240.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-icons_2e83ff_256x240.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-icons_3d80b3_256x240.png b/skins/Vector/skinStyles/jquery.ui/images/ui-icons_3d80b3_256x240.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-icons_3d80b3_256x240.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-icons_3d80b3_256x240.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-icons_666666_256x240.png b/skins/Vector/skinStyles/jquery.ui/images/ui-icons_666666_256x240.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-icons_666666_256x240.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-icons_666666_256x240.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-icons_72a7cf_256x240.png b/skins/Vector/skinStyles/jquery.ui/images/ui-icons_72a7cf_256x240.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-icons_72a7cf_256x240.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-icons_72a7cf_256x240.png diff --git a/resources/src/jquery.ui-themes/vector/images/ui-icons_ffffff_256x240.png b/skins/Vector/skinStyles/jquery.ui/images/ui-icons_ffffff_256x240.png similarity index 100% rename from resources/src/jquery.ui-themes/vector/images/ui-icons_ffffff_256x240.png rename to skins/Vector/skinStyles/jquery.ui/images/ui-icons_ffffff_256x240.png diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.accordion.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.accordion.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.accordion.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.accordion.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.autocomplete.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.autocomplete.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.autocomplete.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.autocomplete.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.button.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.button.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.button.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.button.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.core.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.core.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.core.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.core.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.datepicker.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.datepicker.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.datepicker.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.datepicker.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.dialog.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.dialog.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.dialog.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.dialog.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.progressbar.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.progressbar.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.progressbar.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.progressbar.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.resizable.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.resizable.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.resizable.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.resizable.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.selectable.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.selectable.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.selectable.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.selectable.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.slider.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.slider.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.slider.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.slider.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.tabs.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.tabs.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.tabs.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.tabs.css diff --git a/resources/src/jquery.ui-themes/vector/jquery.ui.theme.css b/skins/Vector/skinStyles/jquery.ui/jquery.ui.theme.css similarity index 100% rename from resources/src/jquery.ui-themes/vector/jquery.ui.theme.css rename to skins/Vector/skinStyles/jquery.ui/jquery.ui.theme.css diff --git a/skins/Vector/components/notifications.less b/skins/Vector/skinStyles/mediawiki.notification.less similarity index 95% rename from skins/Vector/components/notifications.less rename to skins/Vector/skinStyles/mediawiki.notification.less index 5bb6f1a3a1..55cfe76cea 100644 --- a/skins/Vector/components/notifications.less +++ b/skins/Vector/skinStyles/mediawiki.notification.less @@ -1,3 +1,5 @@ +@import "../variables"; + /* mediawiki.notification */ // This wrapper class is needed to ensure these rules have larger CSS diff --git a/skins/Vector/special.less b/skins/Vector/skinStyles/mediawiki.special.less similarity index 100% rename from skins/Vector/special.less rename to skins/Vector/skinStyles/mediawiki.special.less diff --git a/skins/Vector/special.preferences.less b/skins/Vector/skinStyles/mediawiki.special.preferences.less similarity index 98% rename from skins/Vector/special.preferences.less rename to skins/Vector/skinStyles/mediawiki.special.preferences.less index a9b10065f2..592a64d8e6 100644 --- a/skins/Vector/special.preferences.less +++ b/skins/Vector/skinStyles/mediawiki.special.preferences.less @@ -1,5 +1,5 @@ @import "mediawiki.mixins"; -@import "variables"; +@import "../variables"; /** * The following code is highly modified from monobook. It would be nice if the -- 2.20.1