Skip to content

Commit 5d66931

Browse files
gardenrobotgardenrobot
committed
Replace Google Fonts
1 parent 8cf4a1a commit 5d66931

File tree

55 files changed

+303
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+303
-13
lines changed

‎lib/server/app.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ function create (env, ctx) {
6363
cspPolicy = { //TODO make NS work without 'unsafe-inline'
6464
directives: {
6565
defaultSrc: ["'self'"]
66-
, styleSrc: ["'self'", 'https://fonts.googleapis.com/', 'https://fonts.gstatic.com/', "'unsafe-inline'"]
66+
, styleSrc: ["'self'", "'unsafe-inline'"]
6767
, scriptSrc: ["'self'", "'unsafe-inline'"]
68-
, fontSrc: ["'self'", 'https://fonts.googleapis.com/', 'https://fonts.gstatic.com/', 'data:']
68+
, fontSrc: ["'self'", 'data:']
6969
, imgSrc: ["'self'", 'data:']
7070
, objectSrc: ["'none'"] // Restricts <object>, <embed>, and <applet> elements
7171
, reportUri: '/report-violation'
7272
, baseUri: ["'none'"] // Restricts use of the <base> tag
7373
, formAction: ["'self'"] // Restricts where <form> contents may be submitted
74-
, connectSrc: ["'self'", "ws:", "wss:", 'https://fonts.googleapis.com/', 'https://fonts.gstatic.com/']
74+
, connectSrc: ["'self'", "ws:", "wss:"]
7575
, frameSrc: ["'self'"]
7676
, frameAncestors: frameAncestors
7777
}

‎static/api-docs.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<head>
55
<meta charset="UTF-8">
66
<title>Swagger UI: Nightscout API</title>
7-
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
87
<link rel="stylesheet" type="text/css" href="swagger-ui-dist/swagger-ui.css" >
98
<link rel="apple-touch-icon" sizes="57x57" href="/images/apple-touch-icon-57x57.png">
109
<link rel="apple-touch-icon" sizes="60x60" href="/images/apple-touch-icon-60x60.png">

‎static/css/main.css‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
@import url('https://fonts.googleapis.com/css?family=Ubuntu:400,700');
1+
@import url("/css/ubuntu-font.css");
32

43
@font-face {
54
font-family: 'nsicons';
@@ -824,4 +823,4 @@ a, a:visited, a:link {
824823
font-size: 12px;
825824
line-height: 13px;
826825
}
827-
}
826+
}

‎static/css/open-sans-font.css‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
@font-face {
2+
font-family: 'Open Sans';
3+
font-style: italic;
4+
font-weight: 300;
5+
src: url(/font/open-sans/OpenSans-LightItalic.woff2) format('woff2');
6+
}
7+
@font-face {
8+
font-family: 'Open Sans';
9+
font-style: italic;
10+
font-weight: 400;
11+
src: url(/font/open-sans/OpenSans-Italic.woff2) format('woff2');
12+
}
13+
@font-face {
14+
font-family: 'Open Sans';
15+
font-style: italic;
16+
font-weight: 600;
17+
src: url(/font/open-sans/OpenSans-SemiboldItalic.woff2) format('woff2');
18+
}
19+
@font-face {
20+
font-family: 'Open Sans';
21+
font-style: italic;
22+
font-weight: 700;
23+
src: url(/font/open-sans/OpenSans-BoldItalic.woff2) format('woff2');
24+
}
25+
@font-face {
26+
font-family: 'Open Sans';
27+
font-style: normal;
28+
font-weight: 300;
29+
src: url(/font/open-sans/OpenSans-Light.woff2) format('woff2');
30+
}
31+
@font-face {
32+
font-family: 'Open Sans';
33+
font-style: normal;
34+
font-weight: 400;
35+
src: url(/font/open-sans/OpenSans-Regular.woff2) format('woff2');
36+
}
37+
@font-face {
38+
font-family: 'Open Sans';
39+
font-style: normal;
40+
font-weight: 600;
41+
src: url(/font/open-sans/OpenSans-Semibold.woff2) format('woff2');
42+
}
43+
@font-face {
44+
font-family: 'Open Sans';
45+
font-style: normal;
46+
font-weight: 700;
47+
src: url(/font/open-sans/OpenSans-Bold.woff2) format('woff2');
48+
}
49+
@font-face {
50+
font-family: 'Open Sans';
51+
font-style: normal;
52+
font-weight: 800;
53+
src: url(/font/open-sans/OpenSans-ExtraBold.woff2) format('woff2');
54+
}

‎static/css/report.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import url("//fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic");
2-
@import url("//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,300,400,600,700,800");
1+
@import url("/css/ubuntu-font.css");
2+
@import url("/css/open-sans-font.css");
33
@import url("/glyphs/css/fontello.css");
44

55

@@ -109,4 +109,4 @@ label {
109109
font-weight: bold;
110110
font-size: 12pt;
111111
text-transform: uppercase;
112-
}
112+
}

‎static/css/ubuntu-font.css‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
@font-face {
2+
font-family: 'ubuntu';
3+
font-style: italic;
4+
font-weight: 300;
5+
src: url(/font/ubuntu/Ubuntu-LightItalic.woff2) format('woff2');
6+
}
7+
@font-face {
8+
font-family: 'ubuntu';
9+
font-style: italic;
10+
font-weight: 400;
11+
src: url(/font/ubuntu/Ubuntu-Italic.woff2) format('woff2');
12+
}
13+
@font-face {
14+
font-family: 'ubuntu';
15+
font-style: italic;
16+
font-weight: 500;
17+
src: url(/font/ubuntu/Ubuntu-MediumItalic.woff2) format('woff2');
18+
}
19+
@font-face {
20+
font-family: 'ubuntu';
21+
font-style: italic;
22+
font-weight: 700;
23+
src: url(/font/ubuntu/Ubuntu-BoldItalic.woff2) format('woff2');
24+
}
25+
@font-face {
26+
font-family: 'ubuntu';
27+
font-style: normal;
28+
font-weight: 300;
29+
src: url(/font/ubuntu/Ubuntu-Light.woff2) format('woff2');
30+
}
31+
@font-face {
32+
font-family: 'ubuntu';
33+
font-style: normal;
34+
font-weight: 400;
35+
src: url(/font/ubuntu/Ubuntu-Regular.woff2) format('woff2');
36+
}
37+
@font-face {
38+
font-family: 'ubuntu';
39+
font-style: normal;
40+
font-weight: 500;
41+
src: url(/font/ubuntu/Ubuntu-Medium.woff2) format('woff2');
42+
}
43+
@font-face {
44+
font-family: 'ubuntu';
45+
font-style: normal;
46+
font-weight: 700;
47+
src: url(/font/ubuntu/Ubuntu-Bold.woff2) format('woff2');
48+
}

‎static/font/open-sans/OFL.txt‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
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.

‎static/font/open-sans/OpenSans-Bold.woff2‎

56.2 KB
Binary file not shown.

‎static/font/open-sans/OpenSans-BoldItalic.woff2‎

58.5 KB
Binary file not shown.

‎static/font/open-sans/OpenSans-ExtraBold.woff2‎

56.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)