Skip to content

Commit ce4d143

Browse files
committed
Merge #401: Use local JQuery and fonts rather than Google hosted versions
2a9ddd3 Use locally-hosted fonts rather than Google hosting (David A. Harding) afae009 Use local JQuery rather than Google hosted version (David A. Harding)
2 parents 60d8e4a + 2a9ddd3 commit ce4d143

File tree

11 files changed

+126
-5
lines changed

11 files changed

+126
-5
lines changed

COPYING

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Unless otherwise stated in a file or the directory containing a file,
2+
the MIT license applies to all files (see LICENSE in this directory).

_includes/_footer.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@
77
<div>
88
<img src="/assets/images/bitcoin_core_logo.png" alt="bitcoin core logo" width="160"><br />
99
<span class="copyright">&copy; {{ site.time | date: '%Y' }} {{ site.owner.name }}</span>
10-
</div>
10+
</div>
11+
12+
<link rel="stylesheet" href="/assets/css/fonts.css">

_includes/_head.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<script src="/assets/js/vendor/modernizr-2.7.1.custom.min.js"></script>
4444
<![endif]-->
4545

46-
<link href='//fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700%7CPT+Serif:400,700,400italic' rel='stylesheet' type='text/css'>
47-
4846
<!-- Icons -->
4947
<link rel="shortcut icon" href="/assets/images/favicon.ico"><!-- 16x16 -->
5048
<link rel="shortcut icon" href="/assets/images/favicon.png"><!-- 32x32 -->

_includes/_scripts.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<!--<![endif]-->
55
</body>
66

7-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
8-
<script>window.jQuery || document.write('<script src="{{ site.url }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
7+
<script src="/assets/js/vendor/jquery-1.9.1.min.js"></script>'
98
<script src="{{ site.url }}/assets/js/scripts.min.js"></script>
109
{% if site.owner.google.analytics %}
1110
<script>

assets/css/fonts.scss

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
sitemap: false
3+
---
4+
@font-face {
5+
font-family: 'PT Sans Narrow';
6+
font-style: normal;
7+
font-weight: 400;
8+
src: local('PT Sans Narrow'), local('PTSans-Narrow'), url(/assets/fonts/PTSans-Narrow.ttf) format('truetype');
9+
}
10+
@font-face {
11+
font-family: 'PT Sans Narrow';
12+
font-style: normal;
13+
font-weight: 700;
14+
src: local('PT Sans Narrow Bold'), local('PTSans-NarrowBold'), url(/assets/fonts/PTSans-NarrowBold.ttf) format('truetype');
15+
}
16+
@font-face {
17+
font-family: 'PT Serif';
18+
font-style: normal;
19+
font-weight: 400;
20+
src: local('PT Serif'), local('PTSerif-Regular'), url(/assets/fonts/PTSerif-Regular.ttf) format('truetype');
21+
}
22+
@font-face {
23+
font-family: 'PT Serif';
24+
font-style: normal;
25+
font-weight: 700;
26+
src: local('PT Serif Bold'), local('PTSerif-Bold'), url(/assets/fonts/PTSerif-Bold.ttf) format('truetype');
27+
}
28+
@font-face {
29+
font-family: 'PT Serif';
30+
font-style: italic;
31+
font-weight: 400;
32+
src: local('PT Serif Italic'), local('PTSerif-Italic'), url(/assets/fonts/PTSerif-Italic.ttf) format('truetype');
33+
}

assets/fonts/LICENSE

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

assets/fonts/PTSans-Narrow.ttf

80.7 KB
Binary file not shown.

assets/fonts/PTSans-NarrowBold.ttf

119 KB
Binary file not shown.

assets/fonts/PTSerif-Bold.ttf

75.8 KB
Binary file not shown.

assets/fonts/PTSerif-Italic.ttf

87.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)