Njw has uploaded a new change for review. https://gerrit.wikimedia.org/r/71970
Change subject: Improve comments throughout ...................................................................... Improve comments throughout Change-Id: I2c9f2c3d5a59511ba43e4dd75d46da18b185110b --- M Erudite.skin.php M assets/erudite.css M assets/print.css M erudite.php 4 files changed, 32 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite refs/changes/70/71970/1 diff --git a/Erudite.skin.php b/Erudite.skin.php index 7486a63..e536e3d 100644 --- a/Erudite.skin.php +++ b/Erudite.skin.php @@ -1,7 +1,6 @@ <?php /** * Erudite skin - * Based off The Erudite skin for Wordpress. * * @file * @ingroup Skins @@ -15,6 +14,9 @@ public function initPage( OutputPage $out ) { parent::initPage( $out ); + /* Assures mobile devices that the site doesn't assume traditional + * desktop dimensions, so they won't downscale and will instead respect + * things like CSS's @media rules */ $out->addHeadItem( 'viewport', '<meta name="viewport" content="width=device-width">' ); @@ -32,6 +34,10 @@ class EruditeTemplate extends BaseTemplate { /** * Like msgWiki() but it ensures edit section links are never shown. + * + * Needed for Mediawiki 1.19 & 1.20 due to bug 36975: + * https://bugzilla.wikimedia.org/show_bug.cgi?id=36975 + * * @param $message Name of wikitext message to return */ function msgWikiNoEdit( $message ) { diff --git a/assets/erudite.css b/assets/erudite.css index 61b36fe..9e19a18 100644 --- a/assets/erudite.css +++ b/assets/erudite.css @@ -16,16 +16,16 @@ /* Use dark stripes around edge to focus on content */ -div#container { - background: white; -} - div#wrapper { /* @embed */ background: #fafafa url(images/stripes-dark.png); } -/* Typography Base */ +div#container { + background: white; +} + +/* Typography base */ body { font-family: constantia, 'hoefler text', 'palatino linotype', serif; line-height: 1.5; @@ -33,7 +33,7 @@ color: #333333; } -/* use sans-serif font for headings and navigation */ +/* Use sans-serif font for headings and navigation */ h1, h2, h3, @@ -48,6 +48,13 @@ text-rendering: optimizeLegibility; } +/* Set attractive monospace fonts */ +pre, +code { + font-family: consolas, 'deja vu sans mono', 'lucida sans typewriter', monaco, monospace; +} + +/* Headings */ h1 { font-size: 1.5em; text-transform: uppercase; @@ -100,11 +107,6 @@ td > h5:first-child, td > h6:first-child { margin-top: 0; -} - -pre, -code { - font-family: consolas, 'deja vu sans mono', 'lucida sans typewriter', monaco, monospace; } /* Links */ @@ -557,7 +559,7 @@ padding-bottom: 1.5em; } -/* ensure edit form doesn't clear the right floated meta +/* Ensure edit form doesn't clear the right floated meta * (.action-edit is selected so that preview content is cleared) */ body.action-edit #editform, body.action-edit #toolbar, @@ -565,9 +567,9 @@ clear: none; } -/* adjustments for smaller browser viewports */ +/* Adjustments for smaller browser viewports */ @media (max-width: 66em) { - /* top menu is likely to start wrapping, so reduce padding + /* The top menu is likely to start wrapping, so reduce padding * and add a separator */ #menu { padding: 0.7em 1em 0.45em; @@ -591,7 +593,7 @@ } @media (max-width: 60em) { - /* some of the padding is best dispatched with */ + /* Some of the padding is best dispatched with */ #container, #header, #footer-wrap-inner, @@ -609,12 +611,12 @@ } @media (max-width: 40em) { - /* shave padding back a bit further */ + /* Reduce padding a bit further */ #content { padding: 1em 1em 0em; } - /* stack footer columns */ + /* Stack footer columns */ .footer { display: block; float: none; @@ -631,14 +633,14 @@ margin-top: 0.5em; } - /* stack top menu items */ + /* Stack top menu items */ #menu li { float: none !important; border: none; padding: 0em; } - /* disable text justification (user preference) */ + /* Disable text justification (user preference) */ #article, #bodyContent, #mw_content { text-align: left !important; } diff --git a/assets/print.css b/assets/print.css index cc1e7a6..e116de9 100644 --- a/assets/print.css +++ b/assets/print.css @@ -1,3 +1,4 @@ +/* Hide navigation elements */ #header-wrap, #mw-js-message, .entry-meta, @@ -5,6 +6,7 @@ display:none; } +/* Ensure footer text with URL isn't justified */ .printfooter { - text-align: left; + text-align: left !important; } diff --git a/erudite.php b/erudite.php index df7e914..1b36bc3 100644 --- a/erudite.php +++ b/erudite.php @@ -4,9 +4,9 @@ * * @file * @ingroup Skins + * @author Nick White * @author Matt Wiebe * @author Colin Andrew Ferm - * @author Nick White * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ -- To view, visit https://gerrit.wikimedia.org/r/71970 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c9f2c3d5a59511ba43e4dd75d46da18b185110b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/erudite Gerrit-Branch: master Gerrit-Owner: Njw <nick.wh...@durham.ac.uk> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits