jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/335699 )
Change subject: Hygiene: Merge footer v2 style module into default style module
......................................................................
Hygiene: Merge footer v2 style module into default style module
Note there are no caching issues with this change.
Cached HTML will request a url which refers to this module
this will print a problematic modules comment at the top of
the requested resource but will not impact rendering.
Bug: T157075
Change-Id: I65de70de1f88d3746f835a2578423ab517264738
---
M extension.json
M resources/skins.minerva.base.styles/common.less
R resources/skins.minerva.base.styles/footer.less
M resources/skins.minerva.base.styles/ui.less
4 files changed, 10 insertions(+), 25 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 4aa1149..83b8c50 100644
--- a/extension.json
+++ b/extension.json
@@ -119,6 +119,7 @@
"resources/skins.minerva.base.styles/common.less",
"resources/skins.minerva.base.styles/icons.less",
"resources/skins.minerva.base.styles/images.less",
+
"resources/skins.minerva.base.styles/footer.less",
"resources/skins.minerva.base.styles/print.less"
]
},
@@ -244,16 +245,6 @@
"user":
"resources/skins.minerva.icons.images.scripts/userNormal.svg",
"anonymous":
"resources/skins.minerva.icons.images.scripts/userAnonymous.svg"
}
- },
- "skins.minerva.footerV2.styles": {
- "targets": [
- "mobile",
- "desktop"
- ],
- "position": "top",
- "styles": [
-
"resources/skins.minerva.footerV2.styles/common.less"
- ]
},
"skins.minerva.mainPage.styles": {
"targets": [
diff --git a/resources/skins.minerva.base.styles/common.less
b/resources/skins.minerva.base.styles/common.less
index cde7c7e..ff576cf 100644
--- a/resources/skins.minerva.base.styles/common.less
+++ b/resources/skins.minerva.base.styles/common.less
@@ -87,8 +87,8 @@
display: none !important;
}
-// We need to ensure the content has a white background - otherwise it will
+// We need to ensure the content has the chrome background - otherwise it will
// overlap the menu during the main menu reveal/hide animation
#mw-mf-page-center {
- background-color: #fff;
+ background-color: @chromeColor;
}
diff --git a/resources/skins.minerva.footerV2.styles/common.less
b/resources/skins.minerva.base.styles/footer.less
similarity index 88%
rename from resources/skins.minerva.footerV2.styles/common.less
rename to resources/skins.minerva.base.styles/footer.less
index 632b9e9..bb6e2b9 100644
--- a/resources/skins.minerva.footerV2.styles/common.less
+++ b/resources/skins.minerva.base.styles/footer.less
@@ -1,19 +1,6 @@
@import 'minerva.variables';
@import 'minerva.mixins';
-body {
- background-color: @chromeColor;
-
- #mw-mf-page-center {
- background-color: @chromeColor;
- }
-}
-
-.mw-body {
- background-color: @skinContentBgColor;
- padding-bottom: 32px;
-}
-
footer {
border-top: solid 1px @footerBorderColor;
overflow: auto;
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index 8379078..1dbdf0f 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -9,9 +9,16 @@
height: 100%;
}
+body {
+ background-color: @chromeColor;
+}
+
+// FIXME: should we use .mw-body here instead?
#content {
// avoid margin collapsing (see T147956)
border-top: solid 1px transparent;
+ background-color: @skinContentBgColor;
+ padding-bottom: 32px;
}
.header-container {
--
To view, visit https://gerrit.wikimedia.org/r/335699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65de70de1f88d3746f835a2578423ab517264738
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Phuedx <samsm...@wikimedia.org>
Gerrit-Reviewer: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
