jenkins-bot has submitted this change and it was merged.
Change subject: Story 1030: Clean up footer.less
......................................................................
Story 1030: Clean up footer.less
In the process fix vertical centering in the header (elements looked
slightly closer to the top).
Change-Id: I7434687363638e2d1d731b39d15e529a9c616c81
---
M less/common/footer.less
M less/common/typography.less
M less/common/ui.less
M stylesheets/common/footer.css
M stylesheets/common/typography.css
M stylesheets/common/ui.css
6 files changed, 65 insertions(+), 89 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/common/footer.less b/less/common/footer.less
index 3033f18..efbe05b 100644
--- a/less/common/footer.less
+++ b/less/common/footer.less
@@ -8,13 +8,10 @@
padding: 2em @contentMarginRight 1.5em @contentMarginLeft;
margin: 2em 0 0;
border-top: 1px solid #aaa;
- clear: both; /* cancel any floating in the content */
- font-size: @baseFontSize * 0.9;
+ font-size: 0.9em;
h2 {
display: inline;
- margin: 0;
- line-height: inherit;
font-weight: bold;
font-size: @baseFontSize;
@@ -25,8 +22,6 @@
ul {
text-align: center;
- list-style: none;
- margin: 0;
li {
line-height: 1.2;
@@ -47,16 +42,5 @@
border: none;
}
}
- }
-}
-
-// FIXME: remove when all cached pages have new footer HTML
-// (change to be deployed May 14, 2013)
-#content_footer {
- margin: 1em 0 0;
-
- .separator {
- margin: 0 .35em 0 0;
- border-right: 1px solid #aaa;
}
}
diff --git a/less/common/typography.less b/less/common/typography.less
index 125d826..9d4a9ae 100644
--- a/less/common/typography.less
+++ b/less/common/typography.less
@@ -20,7 +20,21 @@
font-family: @fontFamilyHeading;
}
+// h1#section_0 is not inside .content...
+#section_0 {
+ line-height: @headingLineHeight;
+}
+
.content {
+ margin: @headingMargin @contentMarginRight 0 @contentMarginLeft;
+ // make sure that the spinner is visible on lazy loading
+ // (room for spinner + margins)
+ min-height: 100px;
+
+ h1, h2, h3 {
+ line-height: @headingLineHeight;
+ }
+
h2, h3, h4, h5, h6 {
font-family: @fontFamilyHeading;
padding: @headingMargin 0;
@@ -29,13 +43,27 @@
p {
margin-bottom: 8pt;
}
-}
-ol,
-ul {
+ .content_block {
+ h3:first-child {
+ margin-top: 0;
+ }
+ }
+
+ .thumb {
+ margin: 15px 0 15px 0;
+ border: 1px solid #ccc;
+ border-radius: 5px;
+ background: #f9f9f9;
+ text-align: center;
+ }
+
ol,
ul {
- margin-left: 1em;
+ ol,
+ ul {
+ margin-left: 1em;
+ }
}
}
@@ -48,17 +76,14 @@
h1 {
font-size: @baseFontSize * 1.833;
- line-height: @headingLineHeight;
}
h2 {
font-size: ( @baseFontSize / 2 ) * 3; /* 18pt */
- line-height: @headingLineHeight;
}
h3 {
font-size: ( @baseFontSize / 6 ) * 7; /* 14pt */
- line-height: @headingLineHeight;
font-weight: bold;
margin-bottom: 8pt;
}
@@ -78,28 +103,6 @@
sub,
sup {
font-size: ( 3 * @baseFontSize / 4 );
-}
-
-.content {
- margin: @headingMargin @contentMarginRight 0 @contentMarginLeft;
-
- // make sure that the spinner is visible on lazy loading
- // (room for spinner + margins)
- min-height: 100px;
-
- .content_block {
- h3:first-child {
- margin-top: 0;
- }
- }
-
- .thumb {
- margin: 15px 0 15px 0;
- border: 1px solid #ccc;
- border-radius: 5px;
- background: #f9f9f9;
- text-align: center;
- }
}
// FIXME: This is included on all pages but only used by certain special pages.
diff --git a/less/common/ui.less b/less/common/ui.less
index ae0a6ac..4d7a8d7 100644
--- a/less/common/ui.less
+++ b/less/common/ui.less
@@ -4,14 +4,13 @@
.header {
.vertical-gradient( @searchBoxColor, @searchBoxColorTo );
border-bottom: 1px solid #e2e2e2;
- line-height: @headerHeight;
+ line-height: (@headerHeight - 2px);
text-align: center;
- min-height: @headerHeight;
- padding: 0 10px 0 @searchBarPaddingLeft;
+ min-height: (@headerHeight - 2px);
+ padding: 2px 10px 0 @searchBarPaddingLeft;
h1, h2 {
font-size: @baseFontSize * 1.6;
- padding: round( @headerHeight*0.22 ) 0 0;
}
}
diff --git a/stylesheets/common/footer.css b/stylesheets/common/footer.css
index bd5d981..8b5d606 100644
--- a/stylesheets/common/footer.css
+++ b/stylesheets/common/footer.css
@@ -13,15 +13,10 @@
padding: 2em 16px 1.5em 16px;
margin: 2em 0 0;
border-top: 1px solid #aaa;
- clear: both;
- /* cancel any floating in the content */
-
font-size: 0.9em;
}
#footer h2 {
display: inline;
- margin: 0;
- line-height: inherit;
font-weight: bold;
font-size: 1em;
}
@@ -30,8 +25,6 @@
}
#footer ul {
text-align: center;
- list-style: none;
- margin: 0;
}
#footer ul li {
line-height: 1.2;
@@ -49,11 +42,4 @@
#footer ul ul li:last-child,
#footer ul.footer-places li:last-child {
border: none;
-}
-#content_footer {
- margin: 1em 0 0;
-}
-#content_footer .separator {
- margin: 0 .35em 0 0;
- border-right: 1px solid #aaa;
}
diff --git a/stylesheets/common/typography.css
b/stylesheets/common/typography.css
index cf167a2..dc98e67 100644
--- a/stylesheets/common/typography.css
+++ b/stylesheets/common/typography.css
@@ -23,6 +23,18 @@
h1 {
font-family: Georgia, serif;
}
+#section_0 {
+ line-height: 22pt;
+}
+.content {
+ margin: 9pt 16px 0 16px;
+ min-height: 100px;
+}
+.content h1,
+.content h2,
+.content h3 {
+ line-height: 22pt;
+}
.content h2,
.content h3,
.content h4,
@@ -34,10 +46,20 @@
.content p {
margin-bottom: 8pt;
}
-ol ol,
-ul ol,
-ol ul,
-ul ul {
+.content .content_block h3:first-child {
+ margin-top: 0;
+}
+.content .thumb {
+ margin: 15px 0 15px 0;
+ border: 1px solid #ccc;
+ border-radius: 5px;
+ background: #f9f9f9;
+ text-align: center;
+}
+.content ol ol,
+.content ul ol,
+.content ol ul,
+.content ul ul {
margin-left: 1em;
}
dl {
@@ -48,19 +70,16 @@
}
h1 {
font-size: 1.833em;
- line-height: 22pt;
}
h2 {
font-size: 1.5em;
/* 18pt */
- line-height: 22pt;
}
h3 {
font-size: 1.1666666666666665em;
/* 14pt */
- line-height: 22pt;
font-weight: bold;
margin-bottom: 8pt;
}
@@ -76,20 +95,6 @@
sub,
sup {
font-size: 0.75em;
-}
-.content {
- margin: 9pt 16px 0 16px;
- min-height: 100px;
-}
-.content .content_block h3:first-child {
- margin-top: 0;
-}
-.content .thumb {
- margin: 15px 0 15px 0;
- border: 1px solid #ccc;
- border-radius: 5px;
- background: #f9f9f9;
- text-align: center;
}
body.no-margins #content_wrapper > .content {
margin: 0;
diff --git a/stylesheets/common/ui.css b/stylesheets/common/ui.css
index 03a7372..c0a6873 100644
--- a/stylesheets/common/ui.css
+++ b/stylesheets/common/ui.css
@@ -347,15 +347,14 @@
background-image: -webkit-linear-gradient(top, #fafafa 0, #f3f3f3 100%);
background-image: linear-gradient(#fafafa 0, #f3f3f3 100%);
border-bottom: 1px solid #e2e2e2;
- line-height: 46px;
+ line-height: 44px;
text-align: center;
- min-height: 46px;
- padding: 0 10px 0 40px;
+ min-height: 44px;
+ padding: 2px 10px 0 40px;
}
.header h1,
.header h2 {
font-size: 1.6em;
- padding: 10px 0 0;
}
/* Menu buttons */
#mw-mf-main-menu-button,
--
To view, visit https://gerrit.wikimedia.org/r/86796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7434687363638e2d1d731b39d15e529a9c616c81
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera <[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
