Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164143
Change subject: Move less/common/ to less/
......................................................................
Move less/common/ to less/
Remove less/common/
Bug: 71524
Change-Id: I08babd5e2340f9b9ea779ee203185819504d0e6c
---
M includes/Resources.php
R less/Overlay.less
R less/common-js.less
R less/common.less
M less/content/main.less
M less/desktop/mobileBridge.less
M less/desktop/special/nearby.less
R less/drawer.less
R less/footer.less
R less/icons.less
R less/images/ajax-loader.gif
R less/images/anon.png
R less/images/arrow-left.png
R less/images/back-ltr.png
R less/images/back-rtl.png
R less/images/back.png
R less/images/bell.png
R less/images/bell.svg
R less/images/camera.png
R less/images/cancel-light.png
R less/images/cancel-light.svg
R less/images/cancel.png
R less/images/clear.png
R less/images/close-button-beta.png
R less/images/continue.png
R less/images/error.png
R less/images/hide.png
R less/images/magnifying-glass.png
R less/images/magnifying-glass.svg
R less/images/menu/anon.png
R less/images/menu/hamburger.png
R less/images/menu/hamburger.svg
R less/images/menu/home.png
R less/images/menu/loginout.png
R less/images/menu/lowres/main.png
R less/images/menu/main.png
R less/images/menu/nearby.png
R less/images/menu/random.png
R less/images/menu/settings.png
R less/images/menu/uploads.png
R less/images/menu/user.png
R less/images/menu/watchlist.png
R less/images/noimage.png
R less/images/noimage.svg
R less/images/pagemenu/edit-locked.png
R less/images/pagemenu/edit.png
R less/images/pagemenu/talk.png
R less/images/pagemenu/upload-locked.png
R less/images/pagemenu/upload.png
R less/images/show.png
R less/images/user.png
R less/images/watch.png
R less/images/watched.png
R less/mainmenu.less
R less/mainpage.less
M less/modules/mediaViewer.less
R less/pageactions.less
R less/pagelist.less
R less/reset.less
M less/tablet/common.less
R less/toast.less
R less/ui.less
62 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/43/164143/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 40680ea..f95ea94 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -37,7 +37,7 @@
'mobile.pagelist.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
- 'less/common/pagelist.less',
+ 'less/pagelist.less',
),
'position' => 'top',
),
@@ -89,13 +89,13 @@
'skins.minerva.chrome.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
- 'less/common/reset.less',
- 'less/common/ui.less',
- 'less/common/pageactions.less',
- 'less/common/footer.less',
- 'less/common/common.less',
- 'less/common/icons.less',
- 'less/common/mainpage.less',
+ 'less/reset.less',
+ 'less/ui.less',
+ 'less/pageactions.less',
+ 'less/footer.less',
+ 'less/common.less',
+ 'less/icons.less',
+ 'less/mainpage.less',
),
'position' => 'top',
),
@@ -110,7 +110,7 @@
'skins.minerva.drawers.styles' => $wgMFMobileResourceBoilerplate +
array(
'styles' => array(
- 'less/common/drawer.less',
+ 'less/drawer.less',
),
'position' => 'top',
),
@@ -548,14 +548,14 @@
'mobile.toast.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
- 'less/common/toast.less',
+ 'less/toast.less',
),
'position' => 'top',
),
'mobile.stable.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
- 'less/common/common-js.less',
+ 'less/common-js.less',
'less/modules/watchstar.less',
'less/modules/tutorials.less',
),
@@ -581,7 +581,7 @@
'LoadingOverlay.hogan',
),
'styles' => array(
- 'less/common/Overlay.less',
+ 'less/Overlay.less',
)
),
diff --git a/less/common/Overlay.less b/less/Overlay.less
similarity index 100%
rename from less/common/Overlay.less
rename to less/Overlay.less
diff --git a/less/common/common-js.less b/less/common-js.less
similarity index 100%
rename from less/common/common-js.less
rename to less/common-js.less
diff --git a/less/common/common.less b/less/common.less
similarity index 100%
rename from less/common/common.less
rename to less/common.less
diff --git a/less/content/main.less b/less/content/main.less
index 2c17055..57602b4 100644
--- a/less/content/main.less
+++ b/less/content/main.less
@@ -73,7 +73,7 @@
//
// Markup:
// <div class="content">
- // <div class="thumb"><img src="common/images/arrow-left.png"></div>
+ // <div class="thumb"><img src="images/arrow-left.png"></div>
// </div>
//
// Styleguide 1.2.
@@ -127,9 +127,9 @@
//
// Markup:
// <div class="content">
- // <p>This is an <img src="common/images/arrow-left.png"> inline
image.</p>
- // <div class="floatleft"><img
src="common/images/arrow-left.png">Left-aligned image</div>
- // <div class="floatright"><img
src="common/images/arrow-left.png">Right-aligned image</div>
+ // <p>This is an <img src="images/arrow-left.png"> inline image.</p>
+ // <div class="floatleft"><img
src="images/arrow-left.png">Left-aligned image</div>
+ // <div class="floatright"><img
src="images/arrow-left.png">Right-aligned image</div>
// </div>
//
// Styleguide 1.3.
diff --git a/less/desktop/mobileBridge.less b/less/desktop/mobileBridge.less
index 6733818..7a24024 100644
--- a/less/desktop/mobileBridge.less
+++ b/less/desktop/mobileBridge.less
@@ -1,5 +1,5 @@
@import 'minerva.mixins';
-@import '../common/pagelist.less';
+@import '../pagelist.less';
.overlay-enabled {
.skin-vector {
@@ -35,7 +35,7 @@
height: 100px;
}
-
.background-image('../common/images/ajax-loader.gif');
+ .background-image('../images/ajax-loader.gif');
background-repeat: no-repeat;
background-position: center;
.background-size( 32px, auto );
diff --git a/less/desktop/special/nearby.less b/less/desktop/special/nearby.less
index 2b05509..d8b7306 100644
--- a/less/desktop/special/nearby.less
+++ b/less/desktop/special/nearby.less
@@ -1,5 +1,5 @@
// These rules are specifically for Special:Nearby in the Vector and Monobook
skins
-@import "../common/icons.less";
+@import "../icons.less";
.page-list {
list-style: none;
margin-left: 0;
diff --git a/less/common/drawer.less b/less/drawer.less
similarity index 100%
rename from less/common/drawer.less
rename to less/drawer.less
diff --git a/less/common/footer.less b/less/footer.less
similarity index 100%
rename from less/common/footer.less
rename to less/footer.less
diff --git a/less/common/icons.less b/less/icons.less
similarity index 100%
rename from less/common/icons.less
rename to less/icons.less
diff --git a/less/common/images/ajax-loader.gif b/less/images/ajax-loader.gif
similarity index 100%
rename from less/common/images/ajax-loader.gif
rename to less/images/ajax-loader.gif
Binary files differ
diff --git a/less/common/images/anon.png b/less/images/anon.png
similarity index 100%
rename from less/common/images/anon.png
rename to less/images/anon.png
Binary files differ
diff --git a/less/common/images/arrow-left.png b/less/images/arrow-left.png
similarity index 100%
rename from less/common/images/arrow-left.png
rename to less/images/arrow-left.png
Binary files differ
diff --git a/less/common/images/back-ltr.png b/less/images/back-ltr.png
similarity index 100%
rename from less/common/images/back-ltr.png
rename to less/images/back-ltr.png
Binary files differ
diff --git a/less/common/images/back-rtl.png b/less/images/back-rtl.png
similarity index 100%
rename from less/common/images/back-rtl.png
rename to less/images/back-rtl.png
Binary files differ
diff --git a/less/common/images/back.png b/less/images/back.png
similarity index 100%
rename from less/common/images/back.png
rename to less/images/back.png
Binary files differ
diff --git a/less/common/images/bell.png b/less/images/bell.png
similarity index 100%
rename from less/common/images/bell.png
rename to less/images/bell.png
Binary files differ
diff --git a/less/common/images/bell.svg b/less/images/bell.svg
similarity index 100%
rename from less/common/images/bell.svg
rename to less/images/bell.svg
diff --git a/less/common/images/camera.png b/less/images/camera.png
similarity index 100%
rename from less/common/images/camera.png
rename to less/images/camera.png
Binary files differ
diff --git a/less/common/images/cancel-light.png b/less/images/cancel-light.png
similarity index 100%
rename from less/common/images/cancel-light.png
rename to less/images/cancel-light.png
Binary files differ
diff --git a/less/common/images/cancel-light.svg b/less/images/cancel-light.svg
similarity index 100%
rename from less/common/images/cancel-light.svg
rename to less/images/cancel-light.svg
diff --git a/less/common/images/cancel.png b/less/images/cancel.png
similarity index 100%
rename from less/common/images/cancel.png
rename to less/images/cancel.png
Binary files differ
diff --git a/less/common/images/clear.png b/less/images/clear.png
similarity index 100%
rename from less/common/images/clear.png
rename to less/images/clear.png
Binary files differ
diff --git a/less/common/images/close-button-beta.png
b/less/images/close-button-beta.png
similarity index 100%
rename from less/common/images/close-button-beta.png
rename to less/images/close-button-beta.png
Binary files differ
diff --git a/less/common/images/continue.png b/less/images/continue.png
similarity index 100%
rename from less/common/images/continue.png
rename to less/images/continue.png
Binary files differ
diff --git a/less/common/images/error.png b/less/images/error.png
similarity index 100%
rename from less/common/images/error.png
rename to less/images/error.png
Binary files differ
diff --git a/less/common/images/hide.png b/less/images/hide.png
similarity index 100%
rename from less/common/images/hide.png
rename to less/images/hide.png
Binary files differ
diff --git a/less/common/images/magnifying-glass.png
b/less/images/magnifying-glass.png
similarity index 100%
rename from less/common/images/magnifying-glass.png
rename to less/images/magnifying-glass.png
Binary files differ
diff --git a/less/common/images/magnifying-glass.svg
b/less/images/magnifying-glass.svg
similarity index 100%
rename from less/common/images/magnifying-glass.svg
rename to less/images/magnifying-glass.svg
diff --git a/less/common/images/menu/anon.png b/less/images/menu/anon.png
similarity index 100%
rename from less/common/images/menu/anon.png
rename to less/images/menu/anon.png
Binary files differ
diff --git a/less/common/images/menu/hamburger.png
b/less/images/menu/hamburger.png
similarity index 100%
rename from less/common/images/menu/hamburger.png
rename to less/images/menu/hamburger.png
Binary files differ
diff --git a/less/common/images/menu/hamburger.svg
b/less/images/menu/hamburger.svg
similarity index 100%
rename from less/common/images/menu/hamburger.svg
rename to less/images/menu/hamburger.svg
diff --git a/less/common/images/menu/home.png b/less/images/menu/home.png
similarity index 100%
rename from less/common/images/menu/home.png
rename to less/images/menu/home.png
Binary files differ
diff --git a/less/common/images/menu/loginout.png
b/less/images/menu/loginout.png
similarity index 100%
rename from less/common/images/menu/loginout.png
rename to less/images/menu/loginout.png
Binary files differ
diff --git a/less/common/images/menu/lowres/main.png
b/less/images/menu/lowres/main.png
similarity index 100%
rename from less/common/images/menu/lowres/main.png
rename to less/images/menu/lowres/main.png
Binary files differ
diff --git a/less/common/images/menu/main.png b/less/images/menu/main.png
similarity index 100%
rename from less/common/images/menu/main.png
rename to less/images/menu/main.png
Binary files differ
diff --git a/less/common/images/menu/nearby.png b/less/images/menu/nearby.png
similarity index 100%
rename from less/common/images/menu/nearby.png
rename to less/images/menu/nearby.png
Binary files differ
diff --git a/less/common/images/menu/random.png b/less/images/menu/random.png
similarity index 100%
rename from less/common/images/menu/random.png
rename to less/images/menu/random.png
Binary files differ
diff --git a/less/common/images/menu/settings.png
b/less/images/menu/settings.png
similarity index 100%
rename from less/common/images/menu/settings.png
rename to less/images/menu/settings.png
Binary files differ
diff --git a/less/common/images/menu/uploads.png b/less/images/menu/uploads.png
similarity index 100%
rename from less/common/images/menu/uploads.png
rename to less/images/menu/uploads.png
Binary files differ
diff --git a/less/common/images/menu/user.png b/less/images/menu/user.png
similarity index 100%
rename from less/common/images/menu/user.png
rename to less/images/menu/user.png
Binary files differ
diff --git a/less/common/images/menu/watchlist.png
b/less/images/menu/watchlist.png
similarity index 100%
rename from less/common/images/menu/watchlist.png
rename to less/images/menu/watchlist.png
Binary files differ
diff --git a/less/common/images/noimage.png b/less/images/noimage.png
similarity index 100%
rename from less/common/images/noimage.png
rename to less/images/noimage.png
Binary files differ
diff --git a/less/common/images/noimage.svg b/less/images/noimage.svg
similarity index 100%
rename from less/common/images/noimage.svg
rename to less/images/noimage.svg
diff --git a/less/common/images/pagemenu/edit-locked.png
b/less/images/pagemenu/edit-locked.png
similarity index 100%
rename from less/common/images/pagemenu/edit-locked.png
rename to less/images/pagemenu/edit-locked.png
Binary files differ
diff --git a/less/common/images/pagemenu/edit.png
b/less/images/pagemenu/edit.png
similarity index 100%
rename from less/common/images/pagemenu/edit.png
rename to less/images/pagemenu/edit.png
Binary files differ
diff --git a/less/common/images/pagemenu/talk.png
b/less/images/pagemenu/talk.png
similarity index 100%
rename from less/common/images/pagemenu/talk.png
rename to less/images/pagemenu/talk.png
Binary files differ
diff --git a/less/common/images/pagemenu/upload-locked.png
b/less/images/pagemenu/upload-locked.png
similarity index 100%
rename from less/common/images/pagemenu/upload-locked.png
rename to less/images/pagemenu/upload-locked.png
Binary files differ
diff --git a/less/common/images/pagemenu/upload.png
b/less/images/pagemenu/upload.png
similarity index 100%
rename from less/common/images/pagemenu/upload.png
rename to less/images/pagemenu/upload.png
Binary files differ
diff --git a/less/common/images/show.png b/less/images/show.png
similarity index 100%
rename from less/common/images/show.png
rename to less/images/show.png
Binary files differ
diff --git a/less/common/images/user.png b/less/images/user.png
similarity index 100%
rename from less/common/images/user.png
rename to less/images/user.png
Binary files differ
diff --git a/less/common/images/watch.png b/less/images/watch.png
similarity index 100%
rename from less/common/images/watch.png
rename to less/images/watch.png
Binary files differ
diff --git a/less/common/images/watched.png b/less/images/watched.png
similarity index 100%
rename from less/common/images/watched.png
rename to less/images/watched.png
Binary files differ
diff --git a/less/common/mainmenu.less b/less/mainmenu.less
similarity index 100%
rename from less/common/mainmenu.less
rename to less/mainmenu.less
diff --git a/less/common/mainpage.less b/less/mainpage.less
similarity index 100%
rename from less/common/mainpage.less
rename to less/mainpage.less
diff --git a/less/modules/mediaViewer.less b/less/modules/mediaViewer.less
index 5ae9154..8dce070 100644
--- a/less/modules/mediaViewer.less
+++ b/less/modules/mediaViewer.less
@@ -1,4 +1,4 @@
-@import "minerva.variables";
+ @import "minerva.variables";
@import "minerva.mixins";
.overlay.media-viewer {
@@ -53,7 +53,7 @@
right: 10px;
top: 10px;
// Uses a dark theme so swap out the icon
- .background-image-svg-quick( '../common/images/cancel-light' );
+ .background-image-svg-quick( '../images/cancel-light' );
opacity: .75;
}
diff --git a/less/common/pageactions.less b/less/pageactions.less
similarity index 100%
rename from less/common/pageactions.less
rename to less/pageactions.less
diff --git a/less/common/pagelist.less b/less/pagelist.less
similarity index 100%
rename from less/common/pagelist.less
rename to less/pagelist.less
diff --git a/less/common/reset.less b/less/reset.less
similarity index 100%
rename from less/common/reset.less
rename to less/reset.less
diff --git a/less/tablet/common.less b/less/tablet/common.less
index 4575157..d31e3af 100644
--- a/less/tablet/common.less
+++ b/less/tablet/common.less
@@ -82,7 +82,7 @@
padding-left: @blockquotePaddingLeft + 10px;
}
- // Override rules in common/common.less
+ // Override rules in common.less
table {
display: table;
width: auto !important;
diff --git a/less/common/toast.less b/less/toast.less
similarity index 97%
rename from less/common/toast.less
rename to less/toast.less
index 493ae80..8a5433d 100644
--- a/less/common/toast.less
+++ b/less/toast.less
@@ -100,7 +100,7 @@
//
// Styleguide 3.2.
&.error {
- background-image: url(../common/images/error.png);
+ background-image: url(../images/error.png);
background-position: 16px 50%;
background-repeat: no-repeat;
padding-left: 5%;
diff --git a/less/common/ui.less b/less/ui.less
similarity index 100%
rename from less/common/ui.less
rename to less/ui.less
--
To view, visit https://gerrit.wikimedia.org/r/164143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08babd5e2340f9b9ea779ee203185819504d0e6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
