Skip to content

Commit cdbfde9

Browse files
authored
jquery: switch font to self-hosted Cairo
Fixes #446. Closes #451.
1 parent b9584b7 commit cdbfde9

16 files changed

+136
-305
lines changed

themes/jquery/css/base.css

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*! Copyright jQuery Foundation and other contributors
22
* Includes:
33
* - normalize.css v1.0.1 | MIT License | git.io/normalize
4-
* - Font Awesome - http://fortawesome.github.com/Font-Awesome - CC BY 3.0
4+
* - Font Awesome - https://fortawesome.github.com/Font-Awesome - CC BY 3.0
55
*/
66

77
/* ==========================================================================
@@ -111,12 +111,16 @@ body {
111111
padding: 0.2em 0;
112112
}
113113

114+
/* ==========================================================================
115+
FontAwesome (https://fortawesome.github.com/Font-Awesome)
116+
.ttf and .woff files were included in the FontAwesome download.
117+
.woff2 file created with https://github.com/nfroidure/ttf2woff2
118+
========================================================================== */
119+
114120
@font-face {
115-
font-family: 'FontAwesome';
116-
src: url('fonts/fontawesome-webfont.eot?v=3.0.2');
117-
src: url('fonts/fontawesome-webfont.eot?#iefix&v=3.0.2') format('embedded-opentype'),
118-
url('fonts/fontawesome-webfont.woff?v=3.0.2') format('woff'),
119-
url('fonts/fontawesome-webfont.ttf?v=3.0.2') format('truetype');
121+
font-family: "FontAwesome";
122+
src: url("fonts/FontAwesome/fontawesome-webfont.woff2") format("woff2"),
123+
url("fonts/FontAwesome/fontawesome-webfont.woff") format("woff");
120124
font-weight: normal;
121125
font-style: normal;
122126
}
@@ -184,7 +188,7 @@ h6 {
184188

185189
h1, h2, h3, h4, h5, h6 {
186190
font-weight: 700;
187-
font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif !important;
191+
font-family: Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif !important;
188192
}
189193
/*
190194
* Addresses styling not present in IE 7/8/9, Safari 5, and Chrome.
@@ -676,14 +680,35 @@ table {
676680
}
677681

678682
#content th {
679-
font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
683+
font-family: Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
680684
}
681685

682686
#content th,
683687
#content td {
684688
padding: .5em;
685689
}
686690

691+
/* ==========================================================================
692+
Cairo Font (https://github.com/Gue3bara/Cairo)
693+
.ttf files downloaded from Google Fonts, but only used for conversion.
694+
.woff files created with https://github.com/odemiral/woff2sfnt-sfnt2woff
695+
.woff2 files created with https://github.com/nfroidure/ttf2woff2
696+
========================================================================== */
697+
698+
@font-face {
699+
font-family: Cairo;
700+
src: url("fonts/Cairo/Cairo-Regular.woff2") format("woff2"),
701+
url("fonts/Cairo/Cairo-Regular.woff") format("woff");
702+
font-weight: normal;
703+
}
704+
705+
@font-face {
706+
font-family: Cairo;
707+
src: url("fonts/Cairo/Cairo-Bold.woff2") format("woff2"),
708+
url("fonts/Cairo/Cairo-Bold.woff") format("woff");
709+
font-weight: 700;
710+
}
711+
687712
/* ==========================================================================
688713
Font Awesome
689714
========================================================================== */
@@ -1624,14 +1649,14 @@ nav#main ul {
16241649

16251650
nav#main li {
16261651
float: left;
1627-
font: normal normal 16px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
1652+
font: normal 700 16px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
16281653
margin-right: 2px;
16291654
}
16301655

16311656
nav#main li a {
16321657
color: #fff;
16331658
text-decoration: none;
1634-
padding: 6px 10px;
1659+
padding: 2px 10px;
16351660
display: block;
16361661
border: 1px solid transparent;
16371662
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.76);
@@ -1824,7 +1849,7 @@ pre b {
18241849
height: 19px;
18251850
width: 19px;
18261851
padding-top: 0;
1827-
font: bold 11px/19px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
1852+
font: bold 11px/19px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
18281853
border-radius: 12px;
18291854
}
18301855

@@ -1907,7 +1932,7 @@ pre b {
19071932

19081933
#content figcaption {
19091934
box-shadow: 0 0 5px 1px rgba(0, 0, 0, 0.20);
1910-
font: italic 700 12px/20px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
1935+
font: italic 700 12px/20px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
19111936
padding: 10px 5px;
19121937
color: #737272;
19131938
clear: both;
@@ -1979,7 +2004,7 @@ pre b {
19792004

19802005
p.author {
19812006
color: #ababab;
1982-
font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
2007+
font-family: Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
19832008
font-weight: 700;
19842009
margin-top: -20px;
19852010
}
@@ -1993,7 +2018,7 @@ p.author a {
19932018
padding-bottom: .5%;
19942019
margin-bottom: 20px;
19952020
font-weight: 700;
1996-
font-family: "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
2021+
font-family: Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
19972022
color: #666;
19982023
background: url(../images-foundation/gauze.png) #f0f0f0;
19992024
text-shadow: 0 1px 0 #ffffff;
@@ -2016,15 +2041,15 @@ p.author a {
20162041
}
20172042

20182043
#banner-large-image h1, #banner-large-image h2 {
2019-
font: bold 60px/60px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
2044+
font: bold 60px/60px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
20202045
margin-bottom: 0;
20212046
color: #fff;
20222047
text-shadow: 0 0 4px rgba(0, 0, 0, 0.85);
20232048
}
20242049

20252050
#banner-large-image p {
20262051
color: #cccccc;
2027-
font: 700 normal 24px/36px "klavika-web", "Helvetica Neue", sans-serif;
2052+
font: 700 normal 24px/36px Cairo, "Helvetica Neue", sans-serif;
20282053
}
20292054

20302055
#banner-secondary {
@@ -2121,7 +2146,7 @@ input[type="submit"] {
21212146
color: #fff !important;
21222147
text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.35);
21232148
padding: 8px 15px;
2124-
font: bold 16px/16px "klavika-web", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
2149+
font: bold 16px/16px Cairo, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
21252150
transition: all 0.2s;
21262151
background-color: #d18f4f;
21272152
float: left;
@@ -2508,7 +2533,6 @@ footer .books li a cite {
25082533
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5);
25092534
letter-spacing: 0;
25102535
border-radius: 5px 5px 0 0;
2511-
font-weight: normal;
25122536
margin-bottom: 0;
25132537
overflow: hidden;
25142538
}
92.4 KB
Binary file not shown.
47.4 KB
Binary file not shown.
35.3 KB
Binary file not shown.
92.3 KB
Binary file not shown.
46.4 KB
Binary file not shown.
Binary file not shown.

themes/jquery/css/fonts/Cairo/OFL.txt

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright 2009 The Cairo Project Authors (https://github.com/Gue3bara/Cairo)
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.
-47.6 KB
Binary file not shown.
Binary file not shown.
-24.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)