Skip to content

Commit

Permalink
Merge branch 'main' into davelab6-meddon-1031
Browse files Browse the repository at this point in the history
  • Loading branch information
emmamarichal authored Oct 24, 2024
2 parents 8ee775f + 189c5c1 commit 25c0877
Show file tree
Hide file tree
Showing 45 changed files with 517 additions and 603 deletions.
2 changes: 1 addition & 1 deletion .ci/tags.html
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ <h1>Google Fonts Tagger</h1>
methods: {
updateURL() {
const url = new URL(window.location);
if (this.commit) {
if (this.commit && this.commit !== "refs/heads/main") {
url.searchParams.set('commit', this.commit);
} else {
url.searchParams.delete('commit');
Expand Down
Binary file modified ofl/facultyglyphic/FacultyGlyphic-Regular.ttf
Binary file not shown.
4 changes: 2 additions & 2 deletions ofl/facultyglyphic/METADATA.pb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "Faculty Glyphic"
designer: "Dylan Young"
designer: "Koto Studio"
license: "OFL"
category: "SANS_SERIF"
date_added: "2024-10-17"
Expand All @@ -17,7 +17,7 @@ subsets: "latin-ext"
subsets: "menu"
source {
repository_url: "https://github.com/DylanYoungKoto/FacultyGlyphic"
commit: "54ab4ddfac95147ffb344c83756e999f60d5e409"
commit: "217893d53b5e77627f997b41e75e45d5818bc0e2"
files {
source_file: "OFL.txt"
dest_file: "OFL.txt"
Expand Down
14 changes: 14 additions & 0 deletions ofl/montserrat/METADATA.pb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,20 @@ axes {
}
source {
repository_url: "https://github.com/JulietaUla/Montserrat"
commit: "f025b649a5302db60edb04a88199b8b941abc33a"
files {
source_file: "fonts/variable/Montserrat[wght].ttf"
dest_file: "Montserrat[wght].ttf"
}
files {
source_file: "fonts/variable/Montserrat-Italic[wght].ttf"
dest_file: "Montserrat-Italic[wght].ttf"
}
files {
source_file: "OFL.txt"
dest_file: "OFL.txt"
}
branch: "merge-forked-changes"
}
fallbacks {
axis_target {
Expand Down
Binary file modified ofl/montserrat/Montserrat-Italic[wght].ttf
Binary file not shown.
Binary file modified ofl/montserrat/Montserrat[wght].ttf
Binary file not shown.
6 changes: 3 additions & 3 deletions ofl/montserrat/OFL.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
Copyright 2024 The Montserrat.Git Project Authors (https://github.com/JulietaUla/Montserrat.git)

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:
http://scripts.sil.org/OFL
https://openfontlicense.org


-----------------------------------------------------------
Expand Down Expand Up @@ -90,4 +90,4 @@ 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.
OTHER DEALINGS IN THE FONT SOFTWARE.
9 changes: 0 additions & 9 deletions ofl/spectral/DESCRIPTION.en_us.html

This file was deleted.

93 changes: 79 additions & 14 deletions ofl/spectral/METADATA.pb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fonts {
filename: "Spectral-ExtraLight.ttf"
post_script_name: "Spectral-ExtraLight"
full_name: "Spectral ExtraLight"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -19,7 +19,7 @@ fonts {
filename: "Spectral-ExtraLightItalic.ttf"
post_script_name: "Spectral-ExtraLightItalic"
full_name: "Spectral ExtraLight Italic"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -28,7 +28,7 @@ fonts {
filename: "Spectral-Light.ttf"
post_script_name: "Spectral-Light"
full_name: "Spectral Light"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -37,7 +37,7 @@ fonts {
filename: "Spectral-LightItalic.ttf"
post_script_name: "Spectral-LightItalic"
full_name: "Spectral Light Italic"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -46,7 +46,7 @@ fonts {
filename: "Spectral-Regular.ttf"
post_script_name: "Spectral-Regular"
full_name: "Spectral Regular"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -55,7 +55,7 @@ fonts {
filename: "Spectral-Italic.ttf"
post_script_name: "Spectral-Italic"
full_name: "Spectral Italic"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -64,7 +64,7 @@ fonts {
filename: "Spectral-Medium.ttf"
post_script_name: "Spectral-Medium"
full_name: "Spectral Medium"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -73,7 +73,7 @@ fonts {
filename: "Spectral-MediumItalic.ttf"
post_script_name: "Spectral-MediumItalic"
full_name: "Spectral Medium Italic"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -82,7 +82,7 @@ fonts {
filename: "Spectral-SemiBold.ttf"
post_script_name: "Spectral-SemiBold"
full_name: "Spectral SemiBold"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -91,7 +91,7 @@ fonts {
filename: "Spectral-SemiBoldItalic.ttf"
post_script_name: "Spectral-SemiBoldItalic"
full_name: "Spectral SemiBold Italic"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -100,7 +100,7 @@ fonts {
filename: "Spectral-Bold.ttf"
post_script_name: "Spectral-Bold"
full_name: "Spectral Bold"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -109,7 +109,7 @@ fonts {
filename: "Spectral-BoldItalic.ttf"
post_script_name: "Spectral-BoldItalic"
full_name: "Spectral Bold Italic"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -118,7 +118,7 @@ fonts {
filename: "Spectral-ExtraBold.ttf"
post_script_name: "Spectral-ExtraBold"
full_name: "Spectral ExtraBold"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
fonts {
name: "Spectral"
Expand All @@ -127,13 +127,78 @@ fonts {
filename: "Spectral-ExtraBoldItalic.ttf"
post_script_name: "Spectral-ExtraBoldItalic"
full_name: "Spectral ExtraBold Italic"
copyright: "Copyright 2017 The Spectral Project Authors (http://github.com/productiontype/spectral)"
copyright: "Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)"
}
subsets: "cyrillic"
subsets: "cyrillic-ext"
subsets: "latin"
subsets: "latin-ext"
subsets: "menu"
subsets: "vietnamese"
source {
repository_url: "https://github.com/productiontype/Spectral"
commit: "e1179c4fc05c1ba7efd40038e203312b4c90c376"
files {
source_file: "fonts/ttf/Spectral-ExtraLight.ttf"
dest_file: "Spectral-ExtraLight.ttf"
}
files {
source_file: "fonts/ttf/Spectral-ExtraLightItalic.ttf"
dest_file: "Spectral-ExtraLightItalic.ttf"
}
files {
source_file: "fonts/ttf/Spectral-Light.ttf"
dest_file: "Spectral-Light.ttf"
}
files {
source_file: "fonts/ttf/Spectral-LightItalic.ttf"
dest_file: "Spectral-LightItalic.ttf"
}
files {
source_file: "fonts/ttf/Spectral-Regular.ttf"
dest_file: "Spectral-Regular.ttf"
}
files {
source_file: "fonts/ttf/Spectral-Italic.ttf"
dest_file: "Spectral-Italic.ttf"
}
files {
source_file: "fonts/ttf/Spectral-Medium.ttf"
dest_file: "Spectral-Medium.ttf"
}
files {
source_file: "fonts/ttf/Spectral-MediumItalic.ttf"
dest_file: "Spectral-MediumItalic.ttf"
}
files {
source_file: "fonts/ttf/Spectral-SemiBold.ttf"
dest_file: "Spectral-SemiBold.ttf"
}
files {
source_file: "fonts/ttf/Spectral-SemiBoldItalic.ttf"
dest_file: "Spectral-SemiBoldItalic.ttf"
}
files {
source_file: "fonts/ttf/Spectral-Bold.ttf"
dest_file: "Spectral-Bold.ttf"
}
files {
source_file: "fonts/ttf/Spectral-BoldItalic.ttf"
dest_file: "Spectral-BoldItalic.ttf"
}
files {
source_file: "fonts/ttf/Spectral-ExtraBold.ttf"
dest_file: "Spectral-ExtraBold.ttf"
}
files {
source_file: "fonts/ttf/Spectral-ExtraBoldItalic.ttf"
dest_file: "Spectral-ExtraBoldItalic.ttf"
}
files {
source_file: "ofl.txt"
dest_file: "ofl.txt"
}
branch: "master"
}
primary_script: "Latn"
stroke: "SERIF"
Loading

0 comments on commit 25c0877

Please sign in to comment.