jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Drop mf- prefix from less files
......................................................................
Hygiene: Drop mf- prefix from less files
Change-Id: Ic4d57de95a7b61b3c31bfbcbdccf5c9804aa3f2e
---
M includes/Resources.php
R less/actions/history.less
R less/common/buttons.less
M less/common/common-js.less
R less/common/common.less
M less/common/drawer.less
R less/common/enwp.less
R less/common/footer.less
R less/common/hacks.less
R less/common/navigation.less
M less/common/notifications.less
M less/common/overlays.less
M less/common/pageactions.less
M less/common/pagelist.less
R less/common/typography.less
M less/common/ui.less
M less/common/user.less
R less/mixins.less
M less/modules/editor.less
M less/modules/issues.less
M less/modules/languages.less
M less/modules/search.less
R less/modules/tables.less
M less/modules/talk.less
R less/modules/toggle.less
M less/modules/tutorials.less
M less/modules/uploads.less
R less/modules/watchstar.less
M less/specials/mobilediff.less
M less/specials/mobileoptions.less
M less/specials/nearby.less
M less/specials/notifications.less
M less/specials/search.less
M less/specials/uploads.less
M less/specials/userlogin.less
M less/specials/watchlist.less
R less/variables.less
R stylesheets/actions/history.css
D stylesheets/actions/mf-edit.css
R stylesheets/common/common.css
R stylesheets/common/enwp.css
R stylesheets/common/footer.css
R stylesheets/common/hacks.css
R stylesheets/common/navigation.css
R stylesheets/common/typography.css
R stylesheets/modules/references.css
R stylesheets/modules/tables.css
R stylesheets/modules/toggle.css
R stylesheets/modules/watchstar.css
49 files changed, 46 insertions(+), 127 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 6fd95d3..01fb010 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -98,24 +98,24 @@
'mobile.styles.page' => $wgMFMobileResourceBoilerplate + array(
'dependencies' => array( 'mobile.startup' ),
'styles' => array(
- 'stylesheets/common/mf-enwp.css'
+ 'stylesheets/common/enwp.css'
),
),
'mobile.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
'stylesheets/externals/reset.css',
- 'stylesheets/common/mf-common.css',
+ 'stylesheets/common/common.css',
'stylesheets/common/ui.css',
- 'stylesheets/common/mf-typography.css',
- 'stylesheets/common/mf-footer.css',
- 'stylesheets/modules/mf-toggle.css',
+ 'stylesheets/common/typography.css',
+ 'stylesheets/common/footer.css',
+ 'stylesheets/modules/toggle.css',
'stylesheets/common/pagelist.css',
// FIXME: move to module mobile.stable.styles for some
reason it breaks RTL when in that module
- 'stylesheets/common/mf-navigation.css',
+ 'stylesheets/common/navigation.css',
'stylesheets/common/overlays.css',
'stylesheets/common/drawer.css',
- 'stylesheets/common/mf-hacks.css',
+ 'stylesheets/common/hacks.css',
'stylesheets/common/pageactions.css',
),
'position' => 'top',
@@ -318,7 +318,7 @@
'styles' => array(
),
'scripts' => array(
- 'stylesheets/actions/mf-history.css',
+ 'stylesheets/actions/history.css',
),
'group' => 'other',
),
@@ -352,7 +352,7 @@
'mobile-frontend-nearby-to-page',
),
'styles' => array(
- 'stylesheets/modules/mf-tables.css',
+ 'stylesheets/modules/tables.css',
'stylesheets/modules/nearbypages.css',
),
'scripts' => array(
@@ -378,9 +378,9 @@
'stylesheets/common/common-js.css',
'stylesheets/modules/languages.css',
'stylesheets/modules/search.css',
- 'stylesheets/modules/mf-references.css',
+ 'stylesheets/modules/references.css',
'stylesheets/modules/issues.css',
- 'stylesheets/modules/mf-watchstar.css',
+ 'stylesheets/modules/watchstar.css',
'stylesheets/modules/uploads.css',
'stylesheets/modules/tutorials.css',
'stylesheets/modules/editor.css',
diff --git a/less/actions/mf-history.less b/less/actions/history.less
similarity index 86%
rename from less/actions/mf-history.less
rename to less/actions/history.less
index 3563688..4c11691 100644
--- a/less/actions/mf-history.less
+++ b/less/actions/history.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
#mw-history-search {
diff --git a/less/common/mf-buttons.less b/less/common/buttons.less
similarity index 98%
rename from less/common/mf-buttons.less
rename to less/common/buttons.less
index 5182143..f08f6b5 100644
--- a/less/common/mf-buttons.less
+++ b/less/common/buttons.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
/* reuses https://github.com/wikimedia/agora */
// FIXME: Add to custom reset.css file
diff --git a/less/common/common-js.less b/less/common/common-js.less
index 46eba5e..8978a5b 100644
--- a/less/common/common-js.less
+++ b/less/common/common-js.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.loading {
// needs !important to override images from more specific rules
diff --git a/less/common/mf-common.less b/less/common/common.less
similarity index 98%
rename from less/common/mf-common.less
rename to less/common/common.less
index 94cdf4f..9817368 100644
--- a/less/common/mf-common.less
+++ b/less/common/common.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.mw-mf-image-replacement {
font-style: italic;
@@ -65,7 +65,7 @@
}
.button {
- margin: 2em 0 0;
+ margin: 2em 0 0;
}
}
diff --git a/less/common/drawer.less b/less/common/drawer.less
index 7130e42..f243dbc 100644
--- a/less/common/drawer.less
+++ b/less/common/drawer.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.drawer {
text-align: center;
diff --git a/less/common/mf-enwp.less b/less/common/enwp.less
similarity index 98%
rename from less/common/mf-enwp.less
rename to less/common/enwp.less
index 5fa11d2..4fa7a71 100644
--- a/less/common/mf-enwp.less
+++ b/less/common/enwp.less
@@ -4,7 +4,7 @@
IMPORTANT: do not use selectors containing attribute notation e.g. [style]
[colspan]
as they are known to damage the ios app
*/
-@import "../mf-variables.less";
+@import "../variables.less";
// Hide cleanup templates by default to non-javascript users as these stop
them from reading the article itself
#content table.ambox {
diff --git a/less/common/mf-footer.less b/less/common/footer.less
similarity index 96%
rename from less/common/mf-footer.less
rename to less/common/footer.less
index f0f4cf5..3033f18 100644
--- a/less/common/mf-footer.less
+++ b/less/common/footer.less
@@ -2,7 +2,7 @@
initially moved from beta_common.css in
Change-Id: I48bcdc43e72f2a9b60e6d1bfe877d79ad80b6d5d
*/
-@import "../mf-variables.less";
+@import "../variables.less";
#footer {
padding: 2em @contentMarginRight 1.5em @contentMarginLeft;
diff --git a/less/common/mf-hacks.less b/less/common/hacks.less
similarity index 100%
rename from less/common/mf-hacks.less
rename to less/common/hacks.less
diff --git a/less/common/mf-navigation.less b/less/common/navigation.less
similarity index 98%
rename from less/common/mf-navigation.less
rename to less/common/navigation.less
index 0ea487b..57f134f 100644
--- a/less/common/mf-navigation.less
+++ b/less/common/navigation.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
@InfoBoxWLogoSize: 98px;
@overlayAlertTipColor: black;
diff --git a/less/common/notifications.less b/less/common/notifications.less
index 34f8009..c34791b 100644
--- a/less/common/notifications.less
+++ b/less/common/notifications.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
@toastNotificationColor: #373737;
#notifications {
diff --git a/less/common/overlays.less b/less/common/overlays.less
index 8febae3..8986eb0 100644
--- a/less/common/overlays.less
+++ b/less/common/overlays.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.overlay-enabled {
.mw-mf-overlay {
diff --git a/less/common/pageactions.less b/less/common/pageactions.less
index ff53524..179e2ef 100644
--- a/less/common/pageactions.less
+++ b/less/common/pageactions.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
// FIXME: hide in stable till talk code is stable
.stable #ca-talk,
diff --git a/less/common/pagelist.less b/less/common/pagelist.less
index 698b7b7..883b92f 100644
--- a/less/common/pagelist.less
+++ b/less/common/pagelist.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
@thumbGap: 15px;
@thumbWidth: 70px;
diff --git a/less/common/mf-typography.less b/less/common/typography.less
similarity index 98%
rename from less/common/mf-typography.less
rename to less/common/typography.less
index 9a18a59..e5c12eb 100644
--- a/less/common/mf-typography.less
+++ b/less/common/typography.less
@@ -1,4 +1,4 @@
-@import "../mf-variables.less";
+@import "../variables.less";
html {
/* prevent font scaling in landscape in Safari */
diff --git a/less/common/ui.less b/less/common/ui.less
index 750633e..7f20afc 100644
--- a/less/common/ui.less
+++ b/less/common/ui.less
@@ -1,4 +1,4 @@
-@import "mf-buttons.less";
+@import "buttons.less";
@import 'mainmenu.less';
/* Header */
diff --git a/less/common/user.less b/less/common/user.less
index 0847e9a..655797f 100644
--- a/less/common/user.less
+++ b/less/common/user.less
@@ -1,5 +1,5 @@
// FIXME: merge with navigation when notifications in stable
-@import '../mf-mixins.less';
+@import '../mixins.less';
#user-button {
right: 0;
diff --git a/less/mf-mixins.less b/less/mixins.less
similarity index 98%
rename from less/mf-mixins.less
rename to less/mixins.less
index 61ed00b..4d60195 100644
--- a/less/mf-mixins.less
+++ b/less/mixins.less
@@ -1,4 +1,4 @@
-@import "mf-variables.less";
+@import "variables.less";
.watchlist-heading() {
font: inherit;
diff --git a/less/modules/editor.less b/less/modules/editor.less
index 2f93a5e..7c4ff67 100644
--- a/less/modules/editor.less
+++ b/less/modules/editor.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.section_heading {
.edit-page {
diff --git a/less/modules/issues.less b/less/modules/issues.less
index 9c97d61..830e37a 100644
--- a/less/modules/issues.less
+++ b/less/modules/issues.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
a.mw-mf-cleanup {
display: block;
diff --git a/less/modules/languages.less b/less/modules/languages.less
index c6ffb2f..d8f9481 100644
--- a/less/modules/languages.less
+++ b/less/modules/languages.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
button.languageSelector {
margin-top: @headingMargin;
diff --git a/less/modules/search.less b/less/modules/search.less
index 229108f..35b1c5f 100644
--- a/less/modules/search.less
+++ b/less/modules/search.less
@@ -2,7 +2,7 @@
moved from beta_common.css in
Change-Id: Id7715a83f8dc42cbdb23d8cbf982801606236f7c
*/
-@import "../mf-mixins.less";
+@import "../mixins.less";
@clearWidth: 24px;
input.search {
diff --git a/less/modules/mf-tables.less b/less/modules/tables.less
similarity index 97%
rename from less/modules/mf-tables.less
rename to less/modules/tables.less
index 9adb22e..7aae0a8 100644
--- a/less/modules/mf-tables.less
+++ b/less/modules/tables.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.mw-mf-overlay {
.tableContent > table {
diff --git a/less/modules/talk.less b/less/modules/talk.less
index 662df7b..af994c9 100644
--- a/less/modules/talk.less
+++ b/less/modules/talk.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.alpha #page-actions #ca-talk.count a {
diff --git a/less/modules/mf-toggle.less b/less/modules/toggle.less
similarity index 97%
rename from less/modules/mf-toggle.less
rename to less/modules/toggle.less
index 5a101b7..e8d05a6 100644
--- a/less/modules/mf-toggle.less
+++ b/less/modules/toggle.less
@@ -2,7 +2,7 @@
moved from beta_common.css in
Change-Id: I683d029d09340a460b02016c5c4fbd6ada5a9b35
*/
-@import "../mf-mixins.less";
+@import "../mixins.less";
.content_block {
width: 100%; // bug 41401 - without this content doesn't always take up
whole width
diff --git a/less/modules/tutorials.less b/less/modules/tutorials.less
index 02aa63c..25de761 100644
--- a/less/modules/tutorials.less
+++ b/less/modules/tutorials.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
/* Tutorial overlay styling */
@colorTutorial: #006398;
diff --git a/less/modules/uploads.less b/less/modules/uploads.less
index bcbb359..e8e391f 100644
--- a/less/modules/uploads.less
+++ b/less/modules/uploads.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.button.photo {
position: relative;
diff --git a/less/modules/mf-watchstar.less b/less/modules/watchstar.less
similarity index 93%
rename from less/modules/mf-watchstar.less
rename to less/modules/watchstar.less
index 0983349..d246ad8 100644
--- a/less/modules/mf-watchstar.less
+++ b/less/modules/watchstar.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
a.watch-this-article {
&.loading {
diff --git a/less/specials/mobilediff.less b/less/specials/mobilediff.less
index 86c720f..fc57731 100644
--- a/less/specials/mobilediff.less
+++ b/less/specials/mobilediff.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
#mw-mf-diffview {
@userInfoHeight: 5em;
diff --git a/less/specials/mobileoptions.less b/less/specials/mobileoptions.less
index d2ed611..67f885b 100644
--- a/less/specials/mobileoptions.less
+++ b/less/specials/mobileoptions.less
@@ -3,7 +3,7 @@
based on http://acidmartin.wordpress.com/2011/06/18/css3-iphone-toggle-buttons/
*/
-@import "../mf-mixins.less";
+@import "../mixins.less";
/* variables */
@btngrey:#818181;
diff --git a/less/specials/nearby.less b/less/specials/nearby.less
index 798a74a..d908291 100644
--- a/less/specials/nearby.less
+++ b/less/specials/nearby.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.mw-mf-overlay .message {
font-size: 1.2em;
diff --git a/less/specials/notifications.less b/less/specials/notifications.less
index b75ede2..26ba971 100644
--- a/less/specials/notifications.less
+++ b/less/specials/notifications.less
@@ -1,4 +1,4 @@
-@import '../mf-variables.less';
+@import '../variables.less';
.mw-echo-unread .mw-echo-title {
font-weight: bold;
diff --git a/less/specials/search.less b/less/specials/search.less
index b9f4ef9..4f66c26 100644
--- a/less/specials/search.less
+++ b/less/specials/search.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.mobile .searchresults {
ul.mw-search-results {
diff --git a/less/specials/uploads.less b/less/specials/uploads.less
index 5ec6831..1fdd0cd 100644
--- a/less/specials/uploads.less
+++ b/less/specials/uploads.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
/* carousel css */
.overlay-carousel {
diff --git a/less/specials/userlogin.less b/less/specials/userlogin.less
index 77a65aa..9fc920f 100644
--- a/less/specials/userlogin.less
+++ b/less/specials/userlogin.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
// This serves no purpose on the login screen as you are not logged in so
cannot use.
#user-button {
diff --git a/less/specials/watchlist.less b/less/specials/watchlist.less
index 10def69..63a32b8 100644
--- a/less/specials/watchlist.less
+++ b/less/specials/watchlist.less
@@ -1,4 +1,4 @@
-@import "../mf-mixins.less";
+@import "../mixins.less";
.mw-mf-watchlist-selector {
diff --git a/less/mf-variables.less b/less/variables.less
similarity index 100%
rename from less/mf-variables.less
rename to less/variables.less
diff --git a/stylesheets/actions/mf-history.css
b/stylesheets/actions/history.css
similarity index 100%
rename from stylesheets/actions/mf-history.css
rename to stylesheets/actions/history.css
diff --git a/stylesheets/actions/mf-edit.css b/stylesheets/actions/mf-edit.css
deleted file mode 100644
index 313593d..0000000
--- a/stylesheets/actions/mf-edit.css
+++ /dev/null
@@ -1,81 +0,0 @@
-.client-js.page-loading .action-edit #content_wrapper {
- background-image: url(../common/images/ajax-loader.gif);
- min-height: 48px;
- background-repeat: no-repeat;
- background-position: center center;
-}
-.client-js.page-loading .action-edit #content_wrapper #content {
- display: none;
-}
-#mw-anon-edit-warning {
- background: none;
- /* use -webkit prefix for older android browsers eg. nexus 1 */
-
- -moz-background-size: auto 50px auto;
- -o-background-size: auto 50px auto;
- -webkit-background-size: auto 50px auto;
- background-size: auto 50px auto;
- background-position: 10px center;
- border: solid 1px #aaa;
- padding: 15px;
- font-size: 1em;
- padding-left: 60px;
- margin-bottom: 8px;
- line-height: 20px;
- background-image: url(../modules/images/warning.png);
- background-repeat: no-repeat;
- cursor: pointer;
- width: 100%;
- color: black;
- -moz-box-sizing: border-box;
- -o-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
-}
-.templatesUsed,
-#editpage-copywarn {
- margin-top: 8px;
- font-size: 0.75em;
- font-style: italic;
-}
-.templatesUsed .mw-templatesUsedExplanation,
-#editpage-copywarn .mw-templatesUsedExplanation {
- font-weight: bold;
-}
-.templatesUsed li,
-#editpage-copywarn li {
- display: inline;
- margin-right: 8px;
-}
-#editform textarea,
-#editform input {
- border: none;
- box-shadow: none;
-}
-#editform textarea.section_heading {
- margin-bottom: 0;
- padding-bottom: 0;
- line-height: normal;
-}
-#editform textarea,
-#editform input.mw-summary {
- font-size: 1em;
- -moz-box-sizing: border-box;
- -o-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- width: 100%;
- border: solid 1px #ccc;
-}
-#editform .content_block input,
-#editform .section_heading input {
- border: none;
- margin: 0;
- font-size: 1em;
- position: relative;
- width: 60%;
-}
-#editform #wpSave {
- display: block;
- margin-bottom: 10px;
-}
diff --git a/stylesheets/common/mf-common.css b/stylesheets/common/common.css
similarity index 100%
rename from stylesheets/common/mf-common.css
rename to stylesheets/common/common.css
diff --git a/stylesheets/common/mf-enwp.css b/stylesheets/common/enwp.css
similarity index 100%
rename from stylesheets/common/mf-enwp.css
rename to stylesheets/common/enwp.css
diff --git a/stylesheets/common/mf-footer.css b/stylesheets/common/footer.css
similarity index 100%
rename from stylesheets/common/mf-footer.css
rename to stylesheets/common/footer.css
diff --git a/stylesheets/common/mf-hacks.css b/stylesheets/common/hacks.css
similarity index 100%
rename from stylesheets/common/mf-hacks.css
rename to stylesheets/common/hacks.css
diff --git a/stylesheets/common/mf-navigation.css
b/stylesheets/common/navigation.css
similarity index 100%
rename from stylesheets/common/mf-navigation.css
rename to stylesheets/common/navigation.css
diff --git a/stylesheets/common/mf-typography.css
b/stylesheets/common/typography.css
similarity index 100%
rename from stylesheets/common/mf-typography.css
rename to stylesheets/common/typography.css
diff --git a/stylesheets/modules/mf-references.css
b/stylesheets/modules/references.css
similarity index 100%
rename from stylesheets/modules/mf-references.css
rename to stylesheets/modules/references.css
diff --git a/stylesheets/modules/mf-tables.css b/stylesheets/modules/tables.css
similarity index 100%
rename from stylesheets/modules/mf-tables.css
rename to stylesheets/modules/tables.css
diff --git a/stylesheets/modules/mf-toggle.css b/stylesheets/modules/toggle.css
similarity index 100%
rename from stylesheets/modules/mf-toggle.css
rename to stylesheets/modules/toggle.css
diff --git a/stylesheets/modules/mf-watchstar.css
b/stylesheets/modules/watchstar.css
similarity index 100%
rename from stylesheets/modules/mf-watchstar.css
rename to stylesheets/modules/watchstar.css
--
To view, visit https://gerrit.wikimedia.org/r/79425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4d57de95a7b61b3c31bfbcbdccf5c9804aa3f2e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
