Njw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67994
Change subject: Use em for all units except image specific, and a few style
tweaks
......................................................................
Use em for all units except image specific, and a few style tweaks
Style tweaks:
- Message area has appropriate padding
- No top padding on #container so page title starts a bit higher up
- Some unnecessary rules removed
- Minor tweaks of a few sizes when switching to em
Change-Id: I880cd050655f11f981a7840d3695091f422a1381
---
M Erudite.skin.php
M TODO
M assets/erudite.css
3 files changed, 37 insertions(+), 64 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite
refs/changes/94/67994/1
diff --git a/Erudite.skin.php b/Erudite.skin.php
index e2e453a..6fa3256 100644
--- a/Erudite.skin.php
+++ b/Erudite.skin.php
@@ -71,7 +71,7 @@
}
?>
<div id="header" role="banner">
- <h1 id="siteTitle"><span><a href="<?php echo
htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>"
title="<?php $this->text( 'sitename' ); ?>" rel="home"><?php $this->text(
'sitename' ); ?></a></span></h1>
+ <h1 id="siteTitle"><a href="<?php echo
htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>"
title="<?php $this->text( 'sitename' ); ?>" rel="home"><?php $this->text(
'sitename' ); ?></a></h1>
<div id="siteSubtitle"><?php $this->msg( 'tagline' )
?></div>
</div>
@@ -95,9 +95,9 @@
<?php
foreach( array( 'newtalk', 'sitenotice', 'subtitle',
'undelete' ) as $msg ) {
if( $this->data[$msg] ) {
- echo "<div id='$msg' class='message'>";
+ echo "<div id='$msg'
class='message'><p>";
$this->html( $msg );
- echo '</div>';
+ echo '</p></div>';
}
}
?>
diff --git a/TODO b/TODO
index 410be54..e3641be 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
Test that it works fine with ULS extension
-Use consistent units everywhere; fonts are currently mixed px / pt / % / em
Use simpler CSS rules for main content, rather than children of .entry-content
Add small screen CSS rules, specifically to have the top menu and footer
columns stack vertically and to remove the min-width (and width where
appropriate) settings
diff --git a/assets/erudite.css b/assets/erudite.css
index f4345c3..706153d 100644
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -12,7 +12,7 @@
#header,
#access,
#footer-wrap-inner {
- min-width: 96em;
+ min-width: 960px;
width: 90%;
margin: 0 auto;
position: relative;
@@ -30,7 +30,6 @@
/* Use dark stripes around edge to focus on content */
div#container {
background: white;
- padding-top: 2em;
}
div#wrapper {
@@ -45,12 +44,6 @@
line-height: 1.5;
background: #fafafa;
color: #333333;
-}
-
-textarea,
-select,
-input {
- font-size: 12px;
}
h1,
@@ -150,13 +143,16 @@
padding: 1em 0;
}
-#header h1,
-#header h1 a {
+#header h1 {
color: #ffffff;
text-decoration: none;
- font-size: 36px;
+ font-size: 3.6em;
line-height: 1;
margin: 0;
+}
+
+#header a {
+ color: #ffffff;
}
#siteSubtitle {
@@ -321,11 +317,6 @@
margin-right: auto;
}
-/* stop "larger" from .warning multiplying with "1.6em" from p */
-.warning p {
- font-size: 100%;
-}
-
/* Main Links */
.entry-content a {
border-bottom: 1px solid #aaaaaa;
@@ -339,9 +330,9 @@
/* Meta (edit links etc.) */
.entry-meta {
float: right;
- padding-left: 15px;
- margin-left: 15px;
- margin-bottom: 10px;
+ padding-left: 1.5em;
+ margin-left: 1.5em;
+ margin-bottom: 1em;
border-left: 1px solid #aaaaaa;
}
@@ -361,7 +352,7 @@
}
span.editsection {
- font-size: 10pt;
+ font-size: 0.65em; /* 2em (h2) * 0.65em = 1.3em */
}
.toc,
@@ -370,22 +361,22 @@
}
#bodyContent > ul > li {
- margin-left: 10pt;
+ margin-left: 1em;
}
div.entry-content li {
- margin-left: 30px;
+ margin-left: 2em;
}
span.entry-sub-title {
- margin-left: 40px;
- font-size: 10pt;
+ margin-left: 1em;
+ font-size: 1.3em;
font-style: italic;
}
/* References */
.reference {
- font-size: 8pt;
+ font-size: 0.875em; /* 1.6em * 0.875em = 1.4em */
}
ol.references > li:target {
@@ -460,7 +451,7 @@
.thumbcaption {
border: none;
text-align: left;
- padding: 3px !important;
+ padding: 0.1875em !important; /* 1.6em * 0.1875em = 0.3em */
}
div.magnify {
@@ -505,36 +496,11 @@
border: 2px solid #fafafa;
}
-/* Category pages */
-div.entry-content div#mw-pages table tbody tr td h3 {
- font-size: 15pt;
-}
-
-div.entry-content div#mw-subcategories table tbody tr td h3 {
- font-size: 15pt;
-}
-
-div#content-container div.entry-content div#mw-pages table tbody tr td ul {
- font-size: 6pt;
-}
-
-div#content-container div.entry-content div#mw-subcategories table tbody tr td
ul {
- font-size: 6pt;
-}
-
-
-div.mw-spcontent form {
- margin-bottom: 10pt;
-}
-
-/* Protect pages */
-form#mw-Protect-Form fieldset table {
- font-size: 8pt;
-}
-
-/* Special Pages */
+/* Category and Special Page lists */
+#mw-pages ul,
+#mw-subcategories ul,
table.mw-specialpages-table tbody tr td ul {
- font-size: 6pt;
+ font-size: 0.875em; /* 1.6em * 0.875em = 1.4em */
}
/* Category Links */
@@ -570,8 +536,12 @@
width: 90%;
color: #ffffff;
background-color: #666666;
- font-size: 13pt;
- line-height: 36pt;
+ padding: 1.2em 0;
+}
+
+.message p {
+ padding: 0 1em;
+ font-size: 1.6em;
}
.message a:link,
@@ -585,11 +555,15 @@
.mw-search-formheader div.search-types ul li {
float: left;
- margin-left: 20px;
+ margin-left: 2em;
}
div.searchresult {
- margin-top: 15px;
+ margin-top: 1em;
+}
+
+.redirectText {
+ font-size: 1.3em;
}
.mw-jump {
@@ -610,7 +584,7 @@
}
div#bodyContent {
- padding-bottom: 20px;
+ padding-bottom: 1.5em;
}
/* don't give lists massive margins when in tds */
--
To view, visit https://gerrit.wikimedia.org/r/67994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I880cd050655f11f981a7840d3695091f422a1381
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
