Foxtrott has submitted this change and it was merged.
Change subject: Reorganize directories
......................................................................
Reorganize directories
Change-Id: I7e961efaf631b6388991bbba5fdcddb99652b17f
---
M Chameleon.i18n.php
M Chameleon.php
M docs/contact.md
M docs/contribute.md
M docs/variables.md
R resources/i18n/ast.json
R resources/i18n/av.json
R resources/i18n/bcc.json
R resources/i18n/bcl.json
R resources/i18n/be-tarask.json
R resources/i18n/bn.json
R resources/i18n/br.json
R resources/i18n/ca.json
R resources/i18n/ce.json
R resources/i18n/cs.json
R resources/i18n/de.json
R resources/i18n/el.json
R resources/i18n/en.json
R resources/i18n/es.json
R resources/i18n/fa.json
R resources/i18n/fr.json
R resources/i18n/gu.json
R resources/i18n/he.json
R resources/i18n/ia.json
R resources/i18n/id.json
R resources/i18n/it.json
R resources/i18n/ja.json
R resources/i18n/ksh.json
R resources/i18n/lb.json
R resources/i18n/mk.json
R resources/i18n/mn.json
R resources/i18n/ms.json
R resources/i18n/nap.json
R resources/i18n/nb.json
R resources/i18n/nl.json
R resources/i18n/pl.json
R resources/i18n/pt-br.json
R resources/i18n/pt.json
R resources/i18n/qqq.json
R resources/i18n/ru.json
R resources/i18n/sco.json
R resources/i18n/sr-ec.json
R resources/i18n/sr-el.json
R resources/i18n/su.json
R resources/i18n/sv.json
R resources/i18n/ta.json
R resources/i18n/tr.json
R resources/i18n/uk.json
R resources/i18n/vi.json
R resources/i18n/yi.json
R resources/i18n/zh-hans.json
R resources/i18n/zh-hant.json
R resources/js/Components/Modifications/sticky.js
R resources/js/jquery-sticky/.gitignore
R resources/js/jquery-sticky/LICENSE.md
R resources/js/jquery-sticky/README.md
R resources/js/jquery-sticky/bower.json
R resources/js/jquery-sticky/example-center.html
R resources/js/jquery-sticky/example-header.html
R resources/js/jquery-sticky/example-right.html
R resources/js/jquery-sticky/jquery.sticky.js
R resources/styles/Components/Modifications/Sticky.less
R resources/styles/Components/NavbarHorizontal.less
R resources/styles/core.less
R resources/styles/forms.less
R resources/styles/images.less
R resources/styles/mixins.less
R resources/styles/print.less
R resources/styles/screen.less
R resources/styles/specialpages.less
R resources/styles/thumbnails.less
R resources/styles/utils.less
R resources/styles/variables.less
M src/Hooks/SetupAfterCache.php
M tests/phpunit/Hooks/SetupAfterCacheTest.php
75 files changed, 46 insertions(+), 43 deletions(-)
Approvals:
Foxtrott: Verified; Looks good to me, approved
diff --git a/Chameleon.i18n.php b/Chameleon.i18n.php
index 11dd76e..ad66952 100644
--- a/Chameleon.i18n.php
+++ b/Chameleon.i18n.php
@@ -40,7 +40,7 @@
function wfJsonI18nShimf931c1431e4504b8( $cache, $code, &$cachedData ) {
$codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . "/i18n//$csCode.json";
+ $fileName = dirname( __FILE__ ) .
"/resources/i18n//$csCode.json";
if ( is_readable( $fileName ) ) {
$data = FormatJson::decode( file_get_contents(
$fileName ), true );
foreach ( array_keys( $data ) as $key ) {
diff --git a/Chameleon.php b/Chameleon.php
index 9d5eaec..c552b8b 100644
--- a/Chameleon.php
+++ b/Chameleon.php
@@ -65,7 +65,7 @@
// register message file for i18n
$GLOBALS[ 'wgExtensionMessagesFiles' ][ 'Chameleon' ] = __DIR__ .
'/Chameleon.i18n.php';
- $GLOBALS[ 'wgMessagesDirs' ][ 'Chameleon' ] = __DIR__ . '/i18n';
+ $GLOBALS[ 'wgMessagesDirs' ][ 'Chameleon' ] = __DIR__ . '/resources/i18n';
/**
* Using callbacks for hook registration
diff --git a/docs/contact.md b/docs/contact.md
index b41470e..9176cb9 100644
--- a/docs/contact.md
+++ b/docs/contact.md
@@ -1,7 +1,8 @@
## Contact
-For bug reports and feature requests please use the [bug tracker][bugs]. See
-also the [Contribute](contribute.md) section.
+For bug reports and feature requests please see, if it is already reported on
+the list of [][open bugs]. If not, [report it][report bugs]. Also see the
+[Contribute](contribute.md) section for instructions on bug reporting.
For general questions, comments or suggestions you might use the [Chameleon
skin
talk page on MediaWiki.org][chameleon-talk]. For direct contact with the author
@@ -10,7 +11,8 @@
Finally there are the MediaWiki IRC channel (Server: [freenode.net][irc],
Channel: #mediawiki) and the [MediaWiki mailing list][mw-ml].
-[bugs]:
https://bugzilla.wikimedia.org/buglist.cgi?component=Chameleon&resolution=---&resolution=LATER
+[open bugs]:
https://bugzilla.wikimedia.org/buglist.cgi?component=Chameleon&resolution=---&resolution=LATER
+[report bugs]:
https://bugzilla.wikimedia.org/enter_bug.cgi?product=MediaWiki%20skins&component=Chameleon
[chameleon-talk]: https://www.mediawiki.org/wiki/Skin_talk:Chameleon
[mw-mail]: https://www.mediawiki.org/wiki/Special:EmailUser/F.trott
[irc]: http://webchat.freenode.net/
diff --git a/docs/contribute.md b/docs/contribute.md
index db218f0..3e6c957 100644
--- a/docs/contribute.md
+++ b/docs/contribute.md
@@ -4,9 +4,12 @@
### Report bugs, ask for features
-You may help by reporting bugs and feature requests via the [bug
tracker][bugs].
+You may help by reporting bugs and feature requests. First check if an open bug
+already exists on the list of [][open bugs] and if you have new information,
+comment on it. If the bug is not yet reported,
+[open a new bug report][report bugs].
-If you report a bug, please include:
+When you report a bug, please include:
* Exact steps to reproduce the bug
* Expected result
* Observed result
@@ -54,7 +57,8 @@
[chameleon]: https://www.mediawiki.org/wiki/Skin:Chameleon
-[bugs]:
https://bugzilla.wikimedia.org/buglist.cgi?component=Chameleon&resolution=---&resolution=LATER
+[open bugs]:
https://bugzilla.wikimedia.org/buglist.cgi?component=Chameleon&resolution=---&resolution=LATER
+[report bugs]:
https://bugzilla.wikimedia.org/enter_bug.cgi?product=MediaWiki%20skins&component=Chameleon
[how to report a bug]: https://www.mediawiki.org/wiki/How_to_report_a_bug
[screenshots]: https://www.mediawiki.org/wiki/Skin:Chameleon#Screenshots
[twn]: https://translatewiki.net/
diff --git a/docs/variables.md b/docs/variables.md
index 3285153..3ef61bd 100644
--- a/docs/variables.md
+++ b/docs/variables.md
@@ -177,14 +177,14 @@
@line-height-computed | Dimension | 20px
| .../vendor/twitter/bootstrap/less/variables.less
|
@line-height-large | Dimension | 1.33
| .../vendor/twitter/bootstrap/less/variables.less
|
@line-height-small | Dimension | 1.5
| .../vendor/twitter/bootstrap/less/variables.less
|
- @link-color | Color | rgba( 66, 139,
202, 1 ) | .../skins/chameleon/styles/variables.less
|
- @link-external-color | Color | rgba( 66, 139,
202, 1 ) | .../skins/chameleon/styles/variables.less
|
+ @link-color | Color | rgba( 66, 139,
202, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
+ @link-external-color | Color | rgba( 66, 139,
202, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
@link-hover-color | Color | rgba( 42, 100,
150, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
- @link-interwiki-color | Color | rgba( 66, 139,
202, 1 ) | .../skins/chameleon/styles/variables.less
|
- @link-new-color | Color | rgba( 181, 43,
39, 1 ) | .../skins/chameleon/styles/variables.less
|
- @link-stub-color | Color | rgba( 66, 139,
202, 1 ) | .../skins/chameleon/styles/variables.less
|
- @list-bullet-color | Color | rgba( 119, 119,
119, 1 ) | .../skins/chameleon/styles/variables.less
|
- @list-bullet-size | Dimension | 0.7ex
| .../skins/chameleon/styles/variables.less
|
+ @link-interwiki-color | Color | rgba( 66, 139,
202, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
+ @link-new-color | Color | rgba( 181, 43,
39, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
+ @link-stub-color | Color | rgba( 66, 139,
202, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
+ @list-bullet-color | Color | rgba( 119, 119,
119, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
+ @list-bullet-size | Dimension | 0.7ex
|
.../skins/chameleon/resources/styles/variables.less |
@list-group-active-bg | Color | rgba( 66, 139,
202, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
@list-group-active-border | Color | rgba( 66, 139,
202, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
@list-group-active-color | Color | rgba( 255, 255,
255, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
@@ -199,7 +199,7 @@
@list-group-link-color | Color | rgba( 85, 85, 85,
1 ) | .../vendor/twitter/bootstrap/less/variables.less
|
@list-group-link-heading-color | Color | rgba( 51, 51, 51,
1 ) | .../vendor/twitter/bootstrap/less/variables.less
|
@list-group-link-hover-color | Color | rgba( 85, 85, 85,
1 ) | .../vendor/twitter/bootstrap/less/variables.less
|
- @list-level-indent | Dimension | 2.5ex
| .../skins/chameleon/styles/variables.less
|
+ @list-level-indent | Dimension | 2.5ex
|
.../skins/chameleon/resources/styles/variables.less |
@modal-backdrop-bg | Color | rgba( 0, 0, 0, 1
) | .../vendor/twitter/bootstrap/less/variables.less
|
@modal-backdrop-opacity | Dimension | 0.5
| .../vendor/twitter/bootstrap/less/variables.less
|
@modal-content-bg | Color | rgba( 255, 255,
255, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
@@ -248,14 +248,14 @@
@navbar-inverse-toggle-border-color | Color | rgba( 51, 51, 51,
1 ) | .../vendor/twitter/bootstrap/less/variables.less
|
@navbar-inverse-toggle-hover-bg | Color | rgba( 51, 51, 51,
1 ) | .../vendor/twitter/bootstrap/less/variables.less
|
@navbar-inverse-toggle-icon-bar-bg | Color | rgba( 255, 255,
255, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
- @navbar-logo-height | Dimension | 45px
| .../skins/chameleon/styles/variables.less
|
+ @navbar-logo-height | Dimension | 45px
|
.../skins/chameleon/resources/styles/variables.less |
@navbar-margin-bottom | Dimension | 20
| .../vendor/twitter/bootstrap/less/variables.less
|
- @navbar-newtalk-available | Color | rgba( 66, 139,
202, 1 ) | .../skins/chameleon/styles/variables.less
|
- @navbar-newtalk-not-available | Color | rgba( 196, 196,
196, 1 ) | .../skins/chameleon/styles/variables.less
|
+ @navbar-newtalk-available | Color | rgba( 66, 139,
202, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
+ @navbar-newtalk-not-available | Color | rgba( 196, 196,
196, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
@navbar-padding-horizontal | Dimension | 15px
| .../vendor/twitter/bootstrap/less/variables.less
|
@navbar-padding-vertical | Dimension | 15px
| .../vendor/twitter/bootstrap/less/variables.less
|
- @navbar-user-loggedin | Color | rgba( 66, 139,
202, 1 ) | .../skins/chameleon/styles/variables.less
|
- @navbar-user-not-loggedin | Color | rgba( 196, 196,
196, 1 ) | .../skins/chameleon/styles/variables.less
|
+ @navbar-user-loggedin | Color | rgba( 66, 139,
202, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
+ @navbar-user-not-loggedin | Color | rgba( 196, 196,
196, 1 ) |
.../skins/chameleon/resources/styles/variables.less |
@nav-disabled-link-color | Color | rgba( 119, 119,
119, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
@nav-disabled-link-hover-color | Color | rgba( 119, 119,
119, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
@nav-link-hover-bg | Color | rgba( 238, 238,
238, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
@@ -385,9 +385,9 @@
@thumbnail-border | Color | rgba( 221, 221,
221, 1 ) |
.../vendor/twitter/bootstrap/less/variables.less |
@thumbnail-border-radius | Dimension | 4
| .../vendor/twitter/bootstrap/less/variables.less
|
@thumbnail-caption-color | Color | rgba( 51, 51, 51,
1 ) | .../vendor/twitter/bootstrap/less/variables.less
|
- @thumbnail-caption-padding | Dimension | 3px
| .../skins/chameleon/styles/variables.less
|
+ @thumbnail-caption-padding | Dimension | 3px
|
.../skins/chameleon/resources/styles/variables.less |
@thumbnail-padding | Dimension | 4px
| .../vendor/twitter/bootstrap/less/variables.less
|
- @toctitle-font-size | Dimension | 18
| .../skins/chameleon/styles/variables.less
|
+ @toctitle-font-size | Dimension | 18
|
.../skins/chameleon/resources/styles/variables.less |
@tooltip-arrow-color | Color | rgba( 0, 0, 0, 1
) | .../vendor/twitter/bootstrap/less/variables.less
|
@tooltip-arrow-width | Dimension | 5px
| .../vendor/twitter/bootstrap/less/variables.less
|
@tooltip-bg | Color | rgba( 0, 0, 0, 1
) | .../vendor/twitter/bootstrap/less/variables.less
|
diff --git a/i18n/ast.json b/resources/i18n/ast.json
similarity index 100%
rename from i18n/ast.json
rename to resources/i18n/ast.json
diff --git a/i18n/av.json b/resources/i18n/av.json
similarity index 100%
rename from i18n/av.json
rename to resources/i18n/av.json
diff --git a/i18n/bcc.json b/resources/i18n/bcc.json
similarity index 100%
rename from i18n/bcc.json
rename to resources/i18n/bcc.json
diff --git a/i18n/bcl.json b/resources/i18n/bcl.json
similarity index 100%
rename from i18n/bcl.json
rename to resources/i18n/bcl.json
diff --git a/i18n/be-tarask.json b/resources/i18n/be-tarask.json
similarity index 100%
rename from i18n/be-tarask.json
rename to resources/i18n/be-tarask.json
diff --git a/i18n/bn.json b/resources/i18n/bn.json
similarity index 100%
rename from i18n/bn.json
rename to resources/i18n/bn.json
diff --git a/i18n/br.json b/resources/i18n/br.json
similarity index 100%
rename from i18n/br.json
rename to resources/i18n/br.json
diff --git a/i18n/ca.json b/resources/i18n/ca.json
similarity index 100%
rename from i18n/ca.json
rename to resources/i18n/ca.json
diff --git a/i18n/ce.json b/resources/i18n/ce.json
similarity index 100%
rename from i18n/ce.json
rename to resources/i18n/ce.json
diff --git a/i18n/cs.json b/resources/i18n/cs.json
similarity index 100%
rename from i18n/cs.json
rename to resources/i18n/cs.json
diff --git a/i18n/de.json b/resources/i18n/de.json
similarity index 100%
rename from i18n/de.json
rename to resources/i18n/de.json
diff --git a/i18n/el.json b/resources/i18n/el.json
similarity index 100%
rename from i18n/el.json
rename to resources/i18n/el.json
diff --git a/i18n/en.json b/resources/i18n/en.json
similarity index 100%
rename from i18n/en.json
rename to resources/i18n/en.json
diff --git a/i18n/es.json b/resources/i18n/es.json
similarity index 100%
rename from i18n/es.json
rename to resources/i18n/es.json
diff --git a/i18n/fa.json b/resources/i18n/fa.json
similarity index 100%
rename from i18n/fa.json
rename to resources/i18n/fa.json
diff --git a/i18n/fr.json b/resources/i18n/fr.json
similarity index 100%
rename from i18n/fr.json
rename to resources/i18n/fr.json
diff --git a/i18n/gu.json b/resources/i18n/gu.json
similarity index 100%
rename from i18n/gu.json
rename to resources/i18n/gu.json
diff --git a/i18n/he.json b/resources/i18n/he.json
similarity index 100%
rename from i18n/he.json
rename to resources/i18n/he.json
diff --git a/i18n/ia.json b/resources/i18n/ia.json
similarity index 100%
rename from i18n/ia.json
rename to resources/i18n/ia.json
diff --git a/i18n/id.json b/resources/i18n/id.json
similarity index 100%
rename from i18n/id.json
rename to resources/i18n/id.json
diff --git a/i18n/it.json b/resources/i18n/it.json
similarity index 100%
rename from i18n/it.json
rename to resources/i18n/it.json
diff --git a/i18n/ja.json b/resources/i18n/ja.json
similarity index 100%
rename from i18n/ja.json
rename to resources/i18n/ja.json
diff --git a/i18n/ksh.json b/resources/i18n/ksh.json
similarity index 100%
rename from i18n/ksh.json
rename to resources/i18n/ksh.json
diff --git a/i18n/lb.json b/resources/i18n/lb.json
similarity index 100%
rename from i18n/lb.json
rename to resources/i18n/lb.json
diff --git a/i18n/mk.json b/resources/i18n/mk.json
similarity index 100%
rename from i18n/mk.json
rename to resources/i18n/mk.json
diff --git a/i18n/mn.json b/resources/i18n/mn.json
similarity index 100%
rename from i18n/mn.json
rename to resources/i18n/mn.json
diff --git a/i18n/ms.json b/resources/i18n/ms.json
similarity index 100%
rename from i18n/ms.json
rename to resources/i18n/ms.json
diff --git a/i18n/nap.json b/resources/i18n/nap.json
similarity index 100%
rename from i18n/nap.json
rename to resources/i18n/nap.json
diff --git a/i18n/nb.json b/resources/i18n/nb.json
similarity index 100%
rename from i18n/nb.json
rename to resources/i18n/nb.json
diff --git a/i18n/nl.json b/resources/i18n/nl.json
similarity index 100%
rename from i18n/nl.json
rename to resources/i18n/nl.json
diff --git a/i18n/pl.json b/resources/i18n/pl.json
similarity index 100%
rename from i18n/pl.json
rename to resources/i18n/pl.json
diff --git a/i18n/pt-br.json b/resources/i18n/pt-br.json
similarity index 100%
rename from i18n/pt-br.json
rename to resources/i18n/pt-br.json
diff --git a/i18n/pt.json b/resources/i18n/pt.json
similarity index 100%
rename from i18n/pt.json
rename to resources/i18n/pt.json
diff --git a/i18n/qqq.json b/resources/i18n/qqq.json
similarity index 100%
rename from i18n/qqq.json
rename to resources/i18n/qqq.json
diff --git a/i18n/ru.json b/resources/i18n/ru.json
similarity index 100%
rename from i18n/ru.json
rename to resources/i18n/ru.json
diff --git a/i18n/sco.json b/resources/i18n/sco.json
similarity index 100%
rename from i18n/sco.json
rename to resources/i18n/sco.json
diff --git a/i18n/sr-ec.json b/resources/i18n/sr-ec.json
similarity index 100%
rename from i18n/sr-ec.json
rename to resources/i18n/sr-ec.json
diff --git a/i18n/sr-el.json b/resources/i18n/sr-el.json
similarity index 100%
rename from i18n/sr-el.json
rename to resources/i18n/sr-el.json
diff --git a/i18n/su.json b/resources/i18n/su.json
similarity index 100%
rename from i18n/su.json
rename to resources/i18n/su.json
diff --git a/i18n/sv.json b/resources/i18n/sv.json
similarity index 100%
rename from i18n/sv.json
rename to resources/i18n/sv.json
diff --git a/i18n/ta.json b/resources/i18n/ta.json
similarity index 100%
rename from i18n/ta.json
rename to resources/i18n/ta.json
diff --git a/i18n/tr.json b/resources/i18n/tr.json
similarity index 100%
rename from i18n/tr.json
rename to resources/i18n/tr.json
diff --git a/i18n/uk.json b/resources/i18n/uk.json
similarity index 100%
rename from i18n/uk.json
rename to resources/i18n/uk.json
diff --git a/i18n/vi.json b/resources/i18n/vi.json
similarity index 100%
rename from i18n/vi.json
rename to resources/i18n/vi.json
diff --git a/i18n/yi.json b/resources/i18n/yi.json
similarity index 100%
rename from i18n/yi.json
rename to resources/i18n/yi.json
diff --git a/i18n/zh-hans.json b/resources/i18n/zh-hans.json
similarity index 100%
rename from i18n/zh-hans.json
rename to resources/i18n/zh-hans.json
diff --git a/i18n/zh-hant.json b/resources/i18n/zh-hant.json
similarity index 100%
rename from i18n/zh-hant.json
rename to resources/i18n/zh-hant.json
diff --git a/resources/Components/Modifications/sticky.js
b/resources/js/Components/Modifications/sticky.js
similarity index 100%
rename from resources/Components/Modifications/sticky.js
rename to resources/js/Components/Modifications/sticky.js
diff --git a/resources/jquery-sticky/.gitignore
b/resources/js/jquery-sticky/.gitignore
similarity index 100%
rename from resources/jquery-sticky/.gitignore
rename to resources/js/jquery-sticky/.gitignore
diff --git a/resources/jquery-sticky/LICENSE.md
b/resources/js/jquery-sticky/LICENSE.md
similarity index 100%
rename from resources/jquery-sticky/LICENSE.md
rename to resources/js/jquery-sticky/LICENSE.md
diff --git a/resources/jquery-sticky/README.md
b/resources/js/jquery-sticky/README.md
similarity index 100%
rename from resources/jquery-sticky/README.md
rename to resources/js/jquery-sticky/README.md
diff --git a/resources/jquery-sticky/bower.json
b/resources/js/jquery-sticky/bower.json
similarity index 100%
rename from resources/jquery-sticky/bower.json
rename to resources/js/jquery-sticky/bower.json
diff --git a/resources/jquery-sticky/example-center.html
b/resources/js/jquery-sticky/example-center.html
similarity index 100%
rename from resources/jquery-sticky/example-center.html
rename to resources/js/jquery-sticky/example-center.html
diff --git a/resources/jquery-sticky/example-header.html
b/resources/js/jquery-sticky/example-header.html
similarity index 100%
rename from resources/jquery-sticky/example-header.html
rename to resources/js/jquery-sticky/example-header.html
diff --git a/resources/jquery-sticky/example-right.html
b/resources/js/jquery-sticky/example-right.html
similarity index 100%
rename from resources/jquery-sticky/example-right.html
rename to resources/js/jquery-sticky/example-right.html
diff --git a/resources/jquery-sticky/jquery.sticky.js
b/resources/js/jquery-sticky/jquery.sticky.js
similarity index 100%
rename from resources/jquery-sticky/jquery.sticky.js
rename to resources/js/jquery-sticky/jquery.sticky.js
diff --git a/styles/Components/Modifications/Sticky.less
b/resources/styles/Components/Modifications/Sticky.less
similarity index 100%
rename from styles/Components/Modifications/Sticky.less
rename to resources/styles/Components/Modifications/Sticky.less
diff --git a/styles/Components/NavbarHorizontal.less
b/resources/styles/Components/NavbarHorizontal.less
similarity index 100%
rename from styles/Components/NavbarHorizontal.less
rename to resources/styles/Components/NavbarHorizontal.less
diff --git a/styles/core.less b/resources/styles/core.less
similarity index 75%
rename from styles/core.less
rename to resources/styles/core.less
index 1f19ac4..dd0a3be 100644
--- a/styles/core.less
+++ b/resources/styles/core.less
@@ -24,15 +24,15 @@
* @ingroup Skins
*/
-@import "./variables.less";
-@import "./mixins.less";
-@import "./utils.less";
-@import "./images.less";
-@import "./forms.less";
-@import "./thumbnails.less";
-@import "./screen.less";
-@import "./specialpages.less";
-@import "./print.less";
+@import "variables";
+@import "mixins";
+@import "utils";
+@import "images";
+@import "forms";
+@import "thumbnails";
+@import "screen";
+@import "specialpages";
+@import "print";
/**
* Component styles
@@ -40,5 +40,5 @@
* TODO: Include them programmatically only when necessary
*/
-@import "./Components/NavbarHorizontal.less";
-@import "./Components/Modifications/Sticky.less";
+@import "Components/NavbarHorizontal";
+@import "Components/Modifications/Sticky";
diff --git a/styles/forms.less b/resources/styles/forms.less
similarity index 100%
rename from styles/forms.less
rename to resources/styles/forms.less
diff --git a/styles/images.less b/resources/styles/images.less
similarity index 100%
rename from styles/images.less
rename to resources/styles/images.less
diff --git a/styles/mixins.less b/resources/styles/mixins.less
similarity index 100%
rename from styles/mixins.less
rename to resources/styles/mixins.less
diff --git a/styles/print.less b/resources/styles/print.less
similarity index 100%
rename from styles/print.less
rename to resources/styles/print.less
diff --git a/styles/screen.less b/resources/styles/screen.less
similarity index 100%
rename from styles/screen.less
rename to resources/styles/screen.less
diff --git a/styles/specialpages.less b/resources/styles/specialpages.less
similarity index 100%
rename from styles/specialpages.less
rename to resources/styles/specialpages.less
diff --git a/styles/thumbnails.less b/resources/styles/thumbnails.less
similarity index 100%
rename from styles/thumbnails.less
rename to resources/styles/thumbnails.less
diff --git a/styles/utils.less b/resources/styles/utils.less
similarity index 100%
rename from styles/utils.less
rename to resources/styles/utils.less
diff --git a/styles/variables.less b/resources/styles/variables.less
similarity index 100%
rename from styles/variables.less
rename to resources/styles/variables.less
diff --git a/src/Hooks/SetupAfterCache.php b/src/Hooks/SetupAfterCache.php
index 9c31a13..9f24b7b 100644
--- a/src/Hooks/SetupAfterCache.php
+++ b/src/Hooks/SetupAfterCache.php
@@ -119,8 +119,8 @@
}
$this->configuration[ 'wgResourceModules' ][
'skin.chameleon.jquery-sticky' ] = array(
- 'localBasePath' => $this->configuration[
'chameleonLocalPath' ] . '/resources',
- 'remoteBasePath' => $this->configuration[
'chameleonRemotePath' ] . '/resources',
+ 'localBasePath' => $this->configuration[
'chameleonLocalPath' ] . '/resources/js',
+ 'remoteBasePath' => $this->configuration[
'chameleonRemotePath' ] . '/resources/js',
'group' => 'skin.chameleon',
'skinScripts' => array( 'chameleon' => array(
'jquery-sticky/jquery.sticky.js', 'Components/Modifications/sticky.js' ) )
);
@@ -128,9 +128,6 @@
}
protected function registerCommonBootstrapModules() {
-
- // Should we check for
- // $this->isReadableFile(
$this->configuration['wgStyleDirectory'] . '/chameleon/styles/' . 'screen.less'
)
$this->bootstrapManager->addAllBootstrapModules();
@@ -149,8 +146,8 @@
}
$this->bootstrapManager->addExternalModule(
- $this->configuration[ 'chameleonLocalPath' ] .
'/styles/core.less',
- $this->configuration[ 'chameleonRemotePath' ] .
'/styles/'
+ $this->configuration[ 'chameleonLocalPath' ] .
'/resources/styles/core.less',
+ $this->configuration[ 'chameleonRemotePath' ] .
'/resources/styles/'
);
}
diff --git a/tests/phpunit/Hooks/SetupAfterCacheTest.php
b/tests/phpunit/Hooks/SetupAfterCacheTest.php
index 03c8651..401b161 100644
--- a/tests/phpunit/Hooks/SetupAfterCacheTest.php
+++ b/tests/phpunit/Hooks/SetupAfterCacheTest.php
@@ -241,8 +241,8 @@
$expected[ 'wgResourceModules' ] = array();
$expected[ 'wgResourceModules' ][
'skin.chameleon.jquery-sticky' ] = array(
- 'localBasePath' => $expected[ 'chameleonLocalPath' ] .
'/resources',
- 'remoteBasePath' => $expected[ 'chameleonRemotePath' ]
. '/resources',
+ 'localBasePath' => $expected[ 'chameleonLocalPath' ] .
'/resources/js',
+ 'remoteBasePath' => $expected[ 'chameleonRemotePath' ]
. '/resources/js',
'group' => 'skin.chameleon',
'skinScripts' => array(
'chameleon' => array(
'jquery-sticky/jquery.sticky.js', 'Components/Modifications/sticky.js' )
--
To view, visit https://gerrit.wikimedia.org/r/172114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e961efaf631b6388991bbba5fdcddb99652b17f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/chameleon
Gerrit-Branch: master
Gerrit-Owner: Foxtrott <[email protected]>
Gerrit-Reviewer: Foxtrott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
