jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Cleanup special page styles
......................................................................
Hygiene: Cleanup special page styles
Change-Id: I49c15498eeb3f9dedf375b9a821242f6d37f81ff
---
M includes/Resources.php
D less/specials/images/login/refresh.png
D less/specials/images/login/refresh.svg
D less/specials/images/profile/edit.png
D less/specials/images/profile/edit.svg
D less/specials/images/profile/placeholder-edit.png
D less/specials/images/profile/placeholder-edit.svg
D less/specials/images/profile/placeholder-thank.png
D less/specials/images/profile/placeholder-thank.svg
D less/specials/images/profile/thanks.png
D less/specials/images/profile/user.png
D less/specials/images/userAnonymous.png
D less/specials/images/userAnonymous.svg
D less/specials/images/userNormal.png
D less/specials/images/userNormal.svg
M less/spinner.less
R resources/mobile.special.history.styles/default.less
R resources/mobile.special.mobileoptions.styles/mobileoptions.less
R resources/mobile.special.pagefeed.styles/pagefeed.less
R resources/mobile.special.uploads.styles/default.less
R resources/mobile.special.uploads.styles/uploads.less
R resources/mobile.special.userprofile.styles/minerva.less
R resources/skins.minerva.special.search.styles/search.less
R resources/skins.minerva.special.userlogin.styles/userlogin.less
24 files changed, 19 insertions(+), 23 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 0fcd330..6099819 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1515,7 +1515,7 @@
),
'mobile.special.mobileoptions.styles' =>
$wgMFMobileSpecialPageResourceBoilerplate + array(
'styles' => array(
- 'less/specials/mobileoptions.less',
+
'resources/mobile.special.mobileoptions.styles/mobileoptions.less',
),
),
'mobile.special.mobileoptions.scripts' =>
$wgMFMobileSpecialPageResourceBoilerplate + array(
@@ -1623,14 +1623,17 @@
'mobile.special.uploads.styles' =>
$wgMFMobileSpecialPageResourceBoilerplate + array(
'styles' => array(
- 'less/specials/uploads.less',
+ 'resources/mobile.special.uploads.styles/uploads.less',
+ ),
+ 'skinStyles' => array(
+ 'default' =>
'resources/mobile.special.uploads.styles/default.less',
),
),
'mobile.special.pagefeed.styles' =>
$wgMFMobileSpecialPageResourceBoilerplate + array(
'position' => 'top',
'styles' => array(
- 'less/specials/pagefeed.less',
+
'resources/mobile.special.pagefeed.styles/pagefeed.less',
),
),
@@ -1681,10 +1684,11 @@
),
),
+ // FIXME: Use skin Styles
'skins.minerva.special.search.styles' =>
$wgMFMobileSpecialPageResourceBoilerplate + array(
'position' => 'top',
'styles' => array(
- 'less/specials/search.less',
+
'resources/skins.minerva.special.search.styles/search.less',
),
),
@@ -1709,7 +1713,7 @@
'skins.minerva.special.userlogin.styles' =>
$wgMFMobileSpecialPageResourceBoilerplate + array(
'position' => 'top',
'styles' => array(
- 'less/specials/userlogin.less',
+
'resources/skins.minerva.special.userlogin.styles/userlogin.less',
),
),
);
@@ -1824,11 +1828,8 @@
// Module customizations
$wgResourceModuleSkinStyles['default'] = $wgMFResourceBoilerplate + array(
- 'mobile.special.uploads.styles' => array(
- 'less/specials/uploadsDefault.less',
- ),
'mobile.special.history.styles' => array(
- 'less/specials/historyDefault.less',
+ 'resources/mobile.special.history.styles/default.less',
),
);
@@ -1839,7 +1840,7 @@
),
'mediawiki.skinning.content.parsoid' => array(),
'mobile.special.userprofile.styles' => array(
- 'less/specials/userprofile.less',
+ 'resources/mobile.special.userprofile.styles/minerva.less',
),
'mobile.special.history.styles' => array(),
);
diff --git a/less/specials/images/login/refresh.png
b/less/specials/images/login/refresh.png
deleted file mode 100644
index 8dc3b67..0000000
--- a/less/specials/images/login/refresh.png
+++ /dev/null
Binary files differ
diff --git a/less/specials/images/login/refresh.svg
b/less/specials/images/login/refresh.svg
deleted file mode 100644
index 2b57095..0000000
--- a/less/specials/images/login/refresh.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg";
width="40" height="40" viewBox="0 0 40 40"><path fill="#787878" d="M33.117
6.516c-3.263-3-7.613-4.835-12.385-4.835-10.1 0-18.318 8.218-18.318 18.319s8.218
18.319 18.319 18.319c5.042 0 9.615-2.048 12.93-5.356l-3.625-3.625c-2.387
2.378-5.677 3.852-9.305 3.852-7.273-.001-13.19-5.917-13.19-13.19s5.917-13.189
13.19-13.189c3.357 0 6.424 1.263 8.754 3.336l-4.358 4.358h12.457v-12.457l-4.469
4.468z"/></svg>
\ No newline at end of file
diff --git a/less/specials/images/profile/edit.png
b/less/specials/images/profile/edit.png
deleted file mode 100644
index 989ea8e..0000000
--- a/less/specials/images/profile/edit.png
+++ /dev/null
Binary files differ
diff --git a/less/specials/images/profile/edit.svg
b/less/specials/images/profile/edit.svg
deleted file mode 100644
index 57b4690..0000000
--- a/less/specials/images/profile/edit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg";
width="80" height="80" viewBox="0 0 80 80"><path fill="#6D6E70" d="M79.33
22.175c-.218-4.245-2.205-8.366-5.128-11.624-2.997-3.337-7.111-5.904-11.546-6.631-12.989
11.657-45.877 41.16-57.245 51.358l.039.021-.035-.015-4.582 20.647
21.16-2.336.007.014.018-.018h.017l-.003-.011c11.437-10.261 44.299-39.742
57.298-51.405zm-63.483
39.098c-1.628-1.632-3.006-2.633-4.907-3.936l51.425-46.493c1.737.536 4.144 1.94
4.879 3.945l-51.397 46.484z"/></svg>
\ No newline at end of file
diff --git a/less/specials/images/profile/placeholder-edit.png
b/less/specials/images/profile/placeholder-edit.png
deleted file mode 100644
index 4fb4c1e..0000000
--- a/less/specials/images/profile/placeholder-edit.png
+++ /dev/null
Binary files differ
diff --git a/less/specials/images/profile/placeholder-edit.svg
b/less/specials/images/profile/placeholder-edit.svg
deleted file mode 100644
index e69de29..0000000
--- a/less/specials/images/profile/placeholder-edit.svg
+++ /dev/null
diff --git a/less/specials/images/profile/placeholder-thank.png
b/less/specials/images/profile/placeholder-thank.png
deleted file mode 100644
index a81a8e2..0000000
--- a/less/specials/images/profile/placeholder-thank.png
+++ /dev/null
Binary files differ
diff --git a/less/specials/images/profile/placeholder-thank.svg
b/less/specials/images/profile/placeholder-thank.svg
deleted file mode 100644
index 027cb50..0000000
--- a/less/specials/images/profile/placeholder-thank.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg";
width="40" height="40" viewBox="0 0 40 40"><path fill="#ABABAB" d="M6.777
7.25v19.807l-5.08 5.692h33.384c3.072 0 3.216-3.055
3.221-3.208v-22.291h-31.525zm19.843 4.87c1.012 0 1.832.819 1.832 1.833 0
1.012-.82 1.831-1.832 1.831-1.013 0-1.833-.819-1.833-1.831 0-1.014.82-1.833
1.833-1.833zm-7.588 0c1.011 0 1.831.819 1.831 1.833 0 1.012-.82 1.831-1.831
1.831-1.013 0-1.833-.819-1.833-1.831 0-1.014.82-1.833 1.833-1.833zm3.792
15.762c-5.354 0-9.693-4.34-9.693-9.695 0 0 4.854 2.095 9.901 2.095 5.159 0
9.486-2.095 9.486-2.095.001 5.355-4.339 9.695-9.694 9.695z"/></svg>
\ No newline at end of file
diff --git a/less/specials/images/profile/thanks.png
b/less/specials/images/profile/thanks.png
deleted file mode 100644
index 379aa1a..0000000
--- a/less/specials/images/profile/thanks.png
+++ /dev/null
Binary files differ
diff --git a/less/specials/images/profile/user.png
b/less/specials/images/profile/user.png
deleted file mode 100644
index 9799690..0000000
--- a/less/specials/images/profile/user.png
+++ /dev/null
Binary files differ
diff --git a/less/specials/images/userAnonymous.png
b/less/specials/images/userAnonymous.png
deleted file mode 100644
index ce67f88..0000000
--- a/less/specials/images/userAnonymous.png
+++ /dev/null
Binary files differ
diff --git a/less/specials/images/userAnonymous.svg
b/less/specials/images/userAnonymous.svg
deleted file mode 100644
index e458878..0000000
--- a/less/specials/images/userAnonymous.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg
xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 16 16" enable-background="new 0
0 960 560"><path enable-background="new" d="M2.112 0c-1.995 0-2.112 1.932-2.112
1.994v14.006h13.888c1.995 0 2.112-1.932 2.112-1.994v-14.006h-13.888zm.426
4.89s.726.726 2.295.726 2.233-.726 2.233-.726c0 1.026-1.027 1.811-2.295
1.811-1.269 0-2.233-.784-2.233-1.811zm8.935
6.517c-.543.3-1.148.542-1.811.726-.543.121-1.148.179-1.753.179-.726
0-1.39-.121-2.053-.3-.605-.179-1.206-.421-1.69-.726-.3-.179-.421-.605-.179-.905.179-.3.605-.421.906-.179.363.242.847.421
1.327.542 1.027.3 2.174.3 3.201.058.543-.121 1.027-.3
1.448-.542.3-.179.726-.058.906.242.125.305.004.726-.3.905zm-.058-4.706c-1.269
0-2.295-.847-2.295-1.811 0 0 .726.726 2.295.726s2.233-.726 2.233-.726c.063
1.026-.964 1.811-2.233 1.811z" fill="#e7beba"/></svg>
\ No newline at end of file
diff --git a/less/specials/images/userNormal.png
b/less/specials/images/userNormal.png
deleted file mode 100644
index 7f0b0e4..0000000
--- a/less/specials/images/userNormal.png
+++ /dev/null
Binary files differ
diff --git a/less/specials/images/userNormal.svg
b/less/specials/images/userNormal.svg
deleted file mode 100644
index 1a1bd4a..0000000
--- a/less/specials/images/userNormal.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg
xmlns="http://www.w3.org/2000/svg"; viewBox="271.5 72.8 16 16"
enable-background="new 271.5 72.8 437.1 431.8"><g><path d="M273.591 72.8c-2.032
0-2.091 1.907-2.091 2.032v13.968h13.909c2.032 0 2.091-1.907
2.091-2.032v-13.968h-13.909z" fill="#d0d0d0"/><g><circle cx="437" cy="234.1"
r="28" fill="#fff" transform="matrix(.042 0 0 .042 259.047 68.752)"/><circle
cx="553.5" cy="234.1" r="28" fill="#fff" transform="matrix(.042 0 0 .042
259.047 68.752)"/></g><path d="M279.879 85.338c-1.798
0-3.532-.617-4.582-1.609-.248-.248-.248-.68 0-.928s.68-.248.928 0c.806.806
2.167 1.239 3.654 1.239 1.424 0 2.789-.433 3.591-1.239.248-.248.68-.248.928
0s.248.68 0 .928c-1.113.987-2.722 1.609-4.519 1.609z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/less/spinner.less b/less/spinner.less
index 2b1d2b7..dd1d0ff 100644
--- a/less/spinner.less
+++ b/less/spinner.less
@@ -13,15 +13,15 @@
// FIXME: Standardise on a loading class (update ConfirmEdit extension)
.fancycaptcha-reload-loading {
- // FIXME: Review use of !important
- .background-image('images/ajax-loader.gif') !important;
+ // FIXME: Review use of !important
+ .background-image('images/ajax-loader.gif') !important;
}
.loading {
- &.spinner {
- height: 54px;
- text-align: center;
- background-position: 50%;
- margin: 8px auto;
- }
+ &.spinner {
+ height: 54px;
+ text-align: center;
+ background-position: 50%;
+ margin: 8px auto;
+ }
}
diff --git a/less/specials/historyDefault.less
b/resources/mobile.special.history.styles/default.less
similarity index 100%
rename from less/specials/historyDefault.less
rename to resources/mobile.special.history.styles/default.less
diff --git a/less/specials/mobileoptions.less
b/resources/mobile.special.mobileoptions.styles/mobileoptions.less
similarity index 100%
rename from less/specials/mobileoptions.less
rename to resources/mobile.special.mobileoptions.styles/mobileoptions.less
diff --git a/less/specials/pagefeed.less
b/resources/mobile.special.pagefeed.styles/pagefeed.less
similarity index 100%
rename from less/specials/pagefeed.less
rename to resources/mobile.special.pagefeed.styles/pagefeed.less
diff --git a/less/specials/uploadsDefault.less
b/resources/mobile.special.uploads.styles/default.less
similarity index 100%
rename from less/specials/uploadsDefault.less
rename to resources/mobile.special.uploads.styles/default.less
diff --git a/less/specials/uploads.less
b/resources/mobile.special.uploads.styles/uploads.less
similarity index 100%
rename from less/specials/uploads.less
rename to resources/mobile.special.uploads.styles/uploads.less
diff --git a/less/specials/userprofile.less
b/resources/mobile.special.userprofile.styles/minerva.less
similarity index 100%
rename from less/specials/userprofile.less
rename to resources/mobile.special.userprofile.styles/minerva.less
diff --git a/less/specials/search.less
b/resources/skins.minerva.special.search.styles/search.less
similarity index 100%
rename from less/specials/search.less
rename to resources/skins.minerva.special.search.styles/search.less
diff --git a/less/specials/userlogin.less
b/resources/skins.minerva.special.userlogin.styles/userlogin.less
similarity index 100%
rename from less/specials/userlogin.less
rename to resources/skins.minerva.special.userlogin.styles/userlogin.less
--
To view, visit https://gerrit.wikimedia.org/r/212839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49c15498eeb3f9dedf375b9a821242f6d37f81ff
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
