Skip to content

Commit

Permalink
Merge pull request #320 from elichad/host-fonts
Browse files Browse the repository at this point in the history
Avoid importing Google fonts from URL
  • Loading branch information
stain authored Jun 13, 2024
2 parents 0112f8e + e82a196 commit 767bd76
Show file tree
Hide file tree
Showing 20 changed files with 263 additions and 1,360 deletions.
2 changes: 0 additions & 2 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ theme_variables:
github: true
twitter: false
theme_color: 39989F
fonts:
- https://fonts.googleapis.com/css2?family=PT+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap

plugins:
- elixir-toolkit-theme-plugins
Expand Down
40 changes: 40 additions & 0 deletions docs/_sass/_custom_classes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,46 @@ figcaption {
font-size: smaller;
}

body {
font-family: PTSans, sans-serif;
}

@font-face {
font-family: PTSans;
src: url('/assets/fonts/PTSans-Regular.ttf') format('truetype'),
url('/assets/fonts/PTSans-Regular.woff') format('woff'),
url('/assets/fonts/PTSans-Regular.woff2') format('woff2');
font-display: swap;
}

@font-face {
font-family: PTSans;
src: url('/assets/fonts/PTSans-Bold.ttf') format('truetype'),
url('/assets/fonts/PTSans-Bold.woff') format('woff'),
url('/assets/fonts/PTSans-Bold.woff2') format('woff2');
font-weight: 700;
font-display: swap;
}

@font-face {
font-family: PTSans;
src: url('/assets/fonts/PTSans-Italic.ttf') format('truetype'),
url('/assets/fonts/PTSans-Italic.woff') format('woff'),
url('/assets/fonts/PTSans-Italic.woff2') format('woff2');
font-style: italic;
font-display: swap;
}

@font-face {
font-family: PTSans;
src: url('/assets/fonts/PTSans-BoldItalic.ttf') format('truetype'),
url('/assets/fonts/PTSans-BoldItalic.woff') format('woff'),
url('/assets/fonts/PTSans-BoldItalic.woff2') format('woff2');
font-weight: 700;
font-style: italic;
font-display: swap;
}

/*-----Sidebar-----*/
#side-nav {
.btn.sidebar-title {
Expand Down
4 changes: 2 additions & 2 deletions docs/_specification/1.2-DRAFT/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ The descriptor also indicates via the `about` property which entity in the `@gra
We can visualise how the above entity references the **RO-Crate Root** as:

<figure>
<img src="../../assets/img/introduction-figure-1.svg" alt="JSON block with id `ro-crate-metadata.json` has some attributes, `conformsTo` RO-Crate 1.2, and `about` referencing id `./`. An arrow points from the `about` attribute to a second JSON block with id `./`, which contains additional attributes such as name and description." />
<img src="../../assets/img/introduction-figure-1.png" alt="JSON block with id `ro-crate-metadata.json` has some attributes, `conformsTo` RO-Crate 1.2, and `about` referencing id `./`. An arrow points from the `about` attribute to a second JSON block with id `./`, which contains additional attributes such as name and description." />
<figcaption>Figure 2: showing RO-Crate Metadata descriptor's <code>about</code> property pointing at the RO-Crate Root entity with matching <code>@id</code></figcaption>
</figure>

Expand Down Expand Up @@ -157,7 +157,7 @@ A main type of resources collected are _data_ -- simplifying, we can consider da
RO-Crates can also contain data entities that are folders and Web resources, as well as non-File-like data like online databases -- see section on [data entities](data-entities).

<figure id="figure2">
<object type="image/svg+xml" data="../../assets/img/introduction-figure-2.svg">
<object type="image/svg+xml" data="../../assets/img/introduction-figure-2.png">
JSON block with id <code>./</code> has an array under <code>hasPart</code> listing id <code>data.csv</code>. In second JSON block with id <code>data.csv</code> we see it is typed <code>File</code> and have other properties.
</object>
<figcaption>Figure 3: RO-Crate Root entity referencing the data entity with <code>@id</code> identifier <code>data.csv</code></figcaption>
Expand Down
94 changes: 94 additions & 0 deletions docs/assets/fonts/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
Copyright (c) 2010, ParaType Ltd. (http://www.paratype.com/public),
with Reserved Font Names "PT Sans" and "ParaType".

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://openfontlicense.org


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file added docs/assets/fonts/PTSans-Bold.ttf
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-Bold.woff
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-Bold.woff2
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-BoldItalic.ttf
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-BoldItalic.woff
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-BoldItalic.woff2
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-Italic.ttf
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-Italic.woff
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-Italic.woff2
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-Regular.ttf
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-Regular.woff
Binary file not shown.
Binary file added docs/assets/fonts/PTSans-Regular.woff2
Binary file not shown.
Binary file added docs/assets/img/introduction-figure-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 767bd76

Please sign in to comment.