Njw has submitted this change and it was merged. Change subject: Switch to Linux Libertine and Linux Biolinum for body and header fonts ......................................................................
Switch to Linux Libertine and Linux Biolinum for body and header fonts This change is only done with .woff; versions of IE prior to 9 aren't worth the effort. As the font is somewhat smaller than the standard font on many systems, the base size is increased 25%, and menu padding is slightly adjusted to compensate. Change-Id: I7aa64823ee82cbcc7bf7bcfb2d349d5e5a8166c8 --- M COPYING M assets/erudite.css A assets/fonts/LinBiolinum_R.woff A assets/fonts/LinLibertine_R.woff A assets/fonts/LinLibertine_RB.woff A assets/fonts/LinLibertine_RBI.woff A assets/fonts/LinLibertine_RI.woff 7 files changed, 36 insertions(+), 5 deletions(-) Approvals: Njw: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING index 7cf95ae..190dc88 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,9 @@ This skin is released under the GPLv2 or any later version. See below for the full license. +The fonts are from Linux Liberation <http://www.linuxlibertine.org> and are +licensed under the GPL and the OFL. + Copyright 2009-2013 Matt Wiebe, Nick White, Colin Andrew Ferm, Daniel Friesen diff --git a/assets/erudite.css b/assets/erudite.css index da92048..ef4c8ce 100644 --- a/assets/erudite.css +++ b/assets/erudite.css @@ -39,9 +39,39 @@ } /* Typography base */ +@font-face { + font-family: 'Linux Libertine'; + src: url('fonts/LinLibertine_R.woff'); +} + +@font-face { + font-family: 'Linux Libertine'; + font-style: italic; + src: url('fonts/LinLibertine_RI.woff'); +} + +@font-face { + font-family: 'Linux Libertine'; + font-weight: bold; + src: url('fonts/LinLibertine_RB.woff'); +} + +@font-face { + font-family: 'Linux Libertine'; + font-style: italic; + font-weight: bold; + src: url('fonts/LinLibertine_RBI.woff'); +} + +@font-face { + font-family: 'Linux Biolinum'; + src: url('fonts/LinBiolinum_R.woff'); +} + body { - font-family: constantia, 'hoefler text', 'palatino linotype', serif; + font-family: 'Linux Libertine', constantia, 'hoefler text', 'palatino linotype', serif; line-height: 1.4; + font-size: 1.125em; background: #fafafa; color: #333333; } @@ -56,7 +86,7 @@ .entry-meta, #menu, #footer-wrap { - font-family: corbel, 'gill sans', 'gill sans mt', sans-serif; + font-family: 'Linux Biolinum', corbel, 'gill sans', 'gill sans mt', sans-serif; font-weight: normal; text-rendering: optimizeLegibility; } @@ -71,7 +101,6 @@ h1 { font-size: 1.5em; text-transform: uppercase; - letter-spacing: 0.05em; margin-top: 1.3em; } @@ -171,7 +200,7 @@ #menu { margin: 1em 0 -0.625em; overflow: hidden; - padding: 0.75em 2em 0.75em 3.75em; + padding: 0.5em 2em 0.5em 3.75em; background: #333333; background: rgba(50, 50, 50, 0.7); } @@ -223,7 +252,6 @@ margin-bottom: 0.2em; font-size: 1.25em; text-transform: uppercase; - letter-spacing: 0.05em; } .footer a, diff --git a/assets/fonts/LinBiolinum_R.woff b/assets/fonts/LinBiolinum_R.woff new file mode 100644 index 0000000..5c399fd --- /dev/null +++ b/assets/fonts/LinBiolinum_R.woff Binary files differ diff --git a/assets/fonts/LinLibertine_R.woff b/assets/fonts/LinLibertine_R.woff new file mode 100644 index 0000000..0357ad4 --- /dev/null +++ b/assets/fonts/LinLibertine_R.woff Binary files differ diff --git a/assets/fonts/LinLibertine_RB.woff b/assets/fonts/LinLibertine_RB.woff new file mode 100644 index 0000000..a0dbbbf --- /dev/null +++ b/assets/fonts/LinLibertine_RB.woff Binary files differ diff --git a/assets/fonts/LinLibertine_RBI.woff b/assets/fonts/LinLibertine_RBI.woff new file mode 100644 index 0000000..402494e --- /dev/null +++ b/assets/fonts/LinLibertine_RBI.woff Binary files differ diff --git a/assets/fonts/LinLibertine_RI.woff b/assets/fonts/LinLibertine_RI.woff new file mode 100644 index 0000000..e2a0ae4 --- /dev/null +++ b/assets/fonts/LinLibertine_RI.woff Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/93501 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7aa64823ee82cbcc7bf7bcfb2d349d5e5a8166c8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/erudite Gerrit-Branch: master Gerrit-Owner: Njw <nick.wh...@durham.ac.uk> Gerrit-Reviewer: Njw <nick.wh...@durham.ac.uk> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
