Skip to content

Commit

Permalink
Merge pull request #341 from teamsnap/move-dugout
Browse files Browse the repository at this point in the history 
Move asset location
  • Loading branch information
@ryanwi
ryanwi committed Jun 3, 2021
2 parents d5d1db1 + 5c6eb4b commit 86a45d5
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 31 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- `Fixed` for any bug fixes.
- `Security`

=======
## [3.10.8] - 2021-06-03
- https://github.com/teamsnap/teamsnap-ui/pull/341
- `Changed` font paths to teamsnap-ui CDN.

## [3.10.7] - 2021-05-25
- https://github.com/teamsnap/teamsnap-ui/pull/644
- `Fixed` Updated to patch CVE-2021-27515, CVE-2021-23337, CVE-2020-7733, and CVE-2021-27292
Expand Down
5 changes: 3 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@teamsnap/teamsnap-ui",
"version": "3.10.7",
"version": "3.10.8",
"description": "a CSS component library for TeamSnap",
"main": "dist/js/index.js",
"types": "dist/js/index.d.ts",
Expand Down
48 changes: 24 additions & 24 deletions src/css/fonts/museo.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,60 +6,60 @@

@font-face {
font-family: 'MuseoSansRounded100Regular';
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-100-webfont.eot');
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-100-webfont.woff') format('woff'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-100-webfont.ttf') format('truetype'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-100-webfont.svg') format('svg');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-100-webfont.eot');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-100-webfont.woff') format('woff'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-100-webfont.ttf') format('truetype'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-100-webfont.svg') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'MuseoSansRounded300Regular';
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-300-webfont.eot');
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-300-webfont.woff') format('woff'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-300-webfont.ttf') format('truetype'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-300-webfont.svg') format('svg');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-300-webfont.eot');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-300-webfont.woff') format('woff'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-300-webfont.ttf') format('truetype'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-300-webfont.svg') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'MuseoSansRounded500Regular';
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-500-webfont.eot');
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-500-webfont.woff') format('woff'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-500-webfont.ttf') format('truetype'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-500-webfont.svg') format('svg');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-500-webfont.eot');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-500-webfont.woff') format('woff'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-500-webfont.ttf') format('truetype'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-500-webfont.svg') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'MuseoSansRounded700Regular';
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-700-webfont.eot');
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-700-webfont.woff') format('woff'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-700-webfont.ttf') format('truetype'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-700-webfont.svg') format('svg');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-700-webfont.eot');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-700-webfont.woff') format('woff'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-700-webfont.ttf') format('truetype'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-700-webfont.svg') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'MuseoSansRounded900Regular';
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-900-webfont.eot');
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-900-webfont.woff') format('woff'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-900-webfont.ttf') format('truetype'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-900-webfont.svg') format('svg');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-900-webfont.eot');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-900-webfont.woff') format('woff'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-900-webfont.ttf') format('truetype'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-900-webfont.svg') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'MuseoSansRounded1000Regular';
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-1000-webfont.eot');
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-1000-webfont.woff') format('woff'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-1000-webfont.ttf') format('truetype'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/museo/MuseoSansRounded-1000-webfont.svg') format('svg');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-1000-webfont.eot');
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-1000-webfont.woff') format('woff'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-1000-webfont.ttf') format('truetype'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/museo/MuseoSansRounded-1000-webfont.svg') format('svg');
font-weight: normal;
font-style: normal;
}
8 changes: 4 additions & 4 deletions src/css/fonts/ss-pika.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

@font-face {
font-family: "SSPika";
src: url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/ss-pika/ss-pika.eot'),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/ss-pika/ss-pika.woff') format("woff"),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/ss-pika/ss-pika.ttf') format("truetype"),
url('https://dugout.teamsnap.com/teamsnap-ui/2.5.1/assets/fonts/ss-pika/ss-pika.svg') format("svg");
src: url('https://teamsnap-ui.teamsnap.com/assets/fonts/ss-pika/ss-pika.eot'),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/ss-pika/ss-pika.woff') format("woff"),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/ss-pika/ss-pika.ttf') format("truetype"),
url('https://teamsnap-ui.teamsnap.com/assets/fonts/ss-pika/ss-pika.svg') format("svg");
font-weight: normal;
font-style: normal;
}
Expand Down

0 comments on commit 86a45d5

Please sign in to comment.