jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup mf-common.less
......................................................................
Cleanup mf-common.less
Remove undocumented css (should be put in Mobile.css if a problem)
Move main page specific css to mainpage.css
Change-Id: Ic296baebaed1aa457374a44aa24335c2f40821dd
---
M less/common/mf-common.less
M less/mainpage/mainpage.less
M stylesheets/common/mf-common.css
M stylesheets/mainpage/mainpage.css
4 files changed, 44 insertions(+), 86 deletions(-)
Approvals:
JGonera: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/common/mf-common.less b/less/common/mf-common.less
index 5911400..4efebdb 100644
--- a/less/common/mf-common.less
+++ b/less/common/mf-common.less
@@ -89,17 +89,7 @@
}
}
-.mwm-message.mwm-notice {
- background: #FFFFFF;
- font-size: 1.1em;
- color: #000000;
-}
-.mwm-message.mwm-notice a {
- text-decoration: underline;
- font-weight: bold;
- color: #000000;
-}
-
+// FIXME: Review what introduces .mwm-notice
.mwm-notice {
padding: 5px;
background: #dddddd;
@@ -107,6 +97,18 @@
margin-top: 5px;
text-align: center;
border: 1px solid gray;
+
+ &.mwm-message {
+ background: #FFFFFF;
+ font-size: 1.1em;
+ color: #000000;
+
+ a {
+ text-decoration: underline;
+ font-weight: bold;
+ color: #000000;
+ }
+ }
}
#content {
@@ -158,9 +160,7 @@
p,
li,
-dl,
-#mainpage,
-#featured_article {
+dl {
line-height: 1.65;
}
@@ -191,15 +191,6 @@
color: red;
}
-#contentSub {
- margin-bottom: 10px;
-}
-
-#featured_article .noprint,
-.today .noprint {
- display: none;
-}
-
img.thumbborder {
border: 1px solid #cccccc;
}
@@ -212,38 +203,14 @@
float: left;
}
-#content_wrapper.home h1 {
- display: none;
-}
-
#mw-mf-last-modified {
display: block;
font-size: .9em;
margin-top: 1.5em;
}
-#disableButtons {
- text-align: center;
-}
-
-#disableButtons button {
- background: url(images/buttonbg.gif) no-repeat center;
- border: 0;
- height: 23px;
- width: 83px;
-}
-
-#disableButtons #backButton {
- margin-top: 5em;
- margin-bottom: 2em;
-}
-
.mwm-message.mwm-notice {
font-size: 1.1em;
-}
-
-#image_wrapper {
- margin: 8px 0 8px -3px;
}
@media all and (max-width: 500px) {
diff --git a/less/mainpage/mainpage.less b/less/mainpage/mainpage.less
index 706a36b..cd6f81b 100644
--- a/less/mainpage/mainpage.less
+++ b/less/mainpage/mainpage.less
@@ -1,3 +1,14 @@
+#mainpage,
+#featured_article {
+ line-height: 1.65;
+}
+
+#featured_article, .today {
+ .noprint {
+ display: none;
+ }
+}
+
body.page-Main_Page {
table {
diff --git a/stylesheets/common/mf-common.css b/stylesheets/common/mf-common.css
index 77027ba..5ee885a 100644
--- a/stylesheets/common/mf-common.css
+++ b/stylesheets/common/mf-common.css
@@ -74,16 +74,6 @@
padding: 2px 4px;
word-wrap: break-word;
}
-.mwm-message.mwm-notice {
- background: #FFFFFF;
- font-size: 1.1em;
- color: #000000;
-}
-.mwm-message.mwm-notice a {
- text-decoration: underline;
- font-weight: bold;
- color: #000000;
-}
.mwm-notice {
padding: 5px;
background: #dddddd;
@@ -91,6 +81,16 @@
margin-top: 5px;
text-align: center;
border: 1px solid gray;
+}
+.mwm-notice.mwm-message {
+ background: #FFFFFF;
+ font-size: 1.1em;
+ color: #000000;
+}
+.mwm-notice.mwm-message a {
+ text-decoration: underline;
+ font-weight: bold;
+ color: #000000;
}
#content {
position: relative;
@@ -136,9 +136,7 @@
}
p,
li,
-dl,
-#mainpage,
-#featured_article {
+dl {
line-height: 1.65;
}
pre {
@@ -162,13 +160,6 @@
a.new:hover {
color: red;
}
-#contentSub {
- margin-bottom: 10px;
-}
-#featured_article .noprint,
-.today .noprint {
- display: none;
-}
img.thumbborder {
border: 1px solid #cccccc;
}
@@ -180,32 +171,13 @@
table.floatright {
float: left;
}
-#content_wrapper.home h1 {
- display: none;
-}
#mw-mf-last-modified {
display: block;
font-size: .9em;
margin-top: 1.5em;
}
-#disableButtons {
- text-align: center;
-}
-#disableButtons button {
- background: url(images/buttonbg.gif) no-repeat center;
- border: 0;
- height: 23px;
- width: 83px;
-}
-#disableButtons #backButton {
- margin-top: 5em;
- margin-bottom: 2em;
-}
.mwm-message.mwm-notice {
font-size: 1.1em;
-}
-#image_wrapper {
- margin: 8px 0 8px -3px;
}
@media all and (max-width: 500px) {
.mobile div.tleft,
diff --git a/stylesheets/mainpage/mainpage.css
b/stylesheets/mainpage/mainpage.css
index 3e8ee84..50838d4 100644
--- a/stylesheets/mainpage/mainpage.css
+++ b/stylesheets/mainpage/mainpage.css
@@ -1,3 +1,11 @@
+#mainpage,
+#featured_article {
+ line-height: 1.65;
+}
+#featured_article .noprint,
+.today .noprint {
+ display: none;
+}
body.page-Main_Page table tr,
body.page-Main_Page table td {
display: block !important;
--
To view, visit https://gerrit.wikimedia.org/r/67913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic296baebaed1aa457374a44aa24335c2f40821dd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
