jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Kill navigation.less
......................................................................
Hygiene: Kill navigation.less
* Only apply background color to body tag
* Clean up background color on #mw-mf-page-center for clarity
Change-Id: I37c54023b0829cf97ea989cdc03ac0d6db6cdb71
---
M includes/Resources.php
M less/common/common-js.less
M less/common/mainmenu.less
D less/common/navigation.less
M less/common/typography.less
M less/common/ui.less
6 files changed, 41 insertions(+), 48 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index ae2eaf1..0942235 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -112,8 +112,6 @@
'less/common/typography.less',
'less/common/footer.less',
'less/modules/toggle.less',
- // FIXME: move to module mobile.stable.styles for some
reason it breaks RTL when in that module
- 'less/common/navigation.less',
'less/common/overlays.less',
'less/common/drawer.less',
'less/common/hacks.less',
diff --git a/less/common/common-js.less b/less/common/common-js.less
index 8cb93f3..99fb3e0 100644
--- a/less/common/common-js.less
+++ b/less/common/common-js.less
@@ -1,5 +1,10 @@
@import "../mixins.less";
+.error {
+ color: #C85353;
+ background: #FAE1E1 !important;
+}
+
.loading {
&.spinner {
height: 100px;
diff --git a/less/common/mainmenu.less b/less/common/mainmenu.less
index fd2e16b..8f52e59 100644
--- a/less/common/mainmenu.less
+++ b/less/common/mainmenu.less
@@ -11,7 +11,6 @@
#mw-mf-page-center {
width: 100%;
- background-color: white;
position: relative;
z-index: 3;
}
@@ -157,6 +156,8 @@
}
#mw-mf-page-center {
+ // Since we change the color of the body tag above we need to
ensure the content has a white background
+ background: #fff;
position: absolute;
height: 100%;
// set border here (#mw-mf-page-left doesn't expand height)
diff --git a/less/common/navigation.less b/less/common/navigation.less
deleted file mode 100644
index 1e8a010..0000000
--- a/less/common/navigation.less
+++ /dev/null
@@ -1,45 +0,0 @@
-// FIXME: what is the purpose of this file?
-// those rules should probably go somewhere else
-@import "../mixins.less";
-
-// FIXME: this is here only because non-JS version doesn't load watchstar.less
-.watch-this-article {
- background: url(../common/images/watch.png) 50% 50% no-repeat;
- text-indent: -9999px;
-
- &.watched {
- background-image: url(../common/images/watched.png);
- }
-
- &.loading {
- background-image: @ajaxLoadingImage;
- }
-}
-
-.search.error,
-.error {
- color: #C85353;
- background: #FAE1E1;
-}
-
-.alert {
- padding: 1em @contentMarginLeft;
- margin: 0 0 1em;
-
- &.warning {
- color: #850;
- background: #feb
- }
-
- h2 {
- font: bold 100% @fontFamily;
- padding: 0;
- margin: 0 0 .5em 0;
- }
-}
-
-html,
-body {
- background: #fff;
- height: 100%;
-}
diff --git a/less/common/typography.less b/less/common/typography.less
index c2a9f68..faea6e5 100644
--- a/less/common/typography.less
+++ b/less/common/typography.less
@@ -13,6 +13,7 @@
font-family: @fontFamily;
line-height: @bodyLineHeight;
color: #252525;
+ background: #fff;
}
.header h2,
diff --git a/less/common/ui.less b/less/common/ui.less
index ea0ea7c..b69a2f4 100644
--- a/less/common/ui.less
+++ b/less/common/ui.less
@@ -2,6 +2,29 @@
@import "buttons.less";
@import 'mainmenu.less';
+html,
+body {
+ // Ensure overlays take up full screen
+ height: 100%;
+}
+
+// Used for messages on login screen, page lists and uploads and when showing
old revisions
+.alert {
+ padding: 1em @contentMarginLeft;
+ margin: 0 0 1em;
+
+ &.warning {
+ color: #850;
+ background: #feb
+ }
+
+ h2 {
+ font: bold 100% @fontFamily;
+ padding: 0;
+ margin: 0 0 .5em 0;
+ }
+}
+
.header {
// .header needs position: relative, it's not always at the top of the
page
// (Zero banners, campaigns)
@@ -118,6 +141,16 @@
display: none;
}
+// FIXME: this is here only because non-JS version doesn't load watchstar.less
+.watch-this-article {
+ background: url(../common/images/watch.png) 50% 50% no-repeat;
+ text-indent: -9999px;
+
+ &.watched {
+ background-image: url(../common/images/watched.png);
+ }
+}
+
// FIXME: Move to beta/alpha only place?
.alpha,
.beta {
--
To view, visit https://gerrit.wikimedia.org/r/92000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37c54023b0829cf97ea989cdc03ac0d6db6cdb71
Gerrit-PatchSet: 8
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: Kaldari <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
