Skip to content

Commit 57b7949

Browse files
committedMay 20, 2020
- Switch fonts to use google fonts.
- npm update - composer update
1 parent 5a58e7b commit 57b7949

13 files changed

+509
-328
lines changed
 
-18.4 KB
Binary file not shown.
-14.2 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
-15 KB
Binary file not shown.
-11.8 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

‎dev/sass/fonts.scss

-42
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,3 @@
11
$font-size: 16px;
22
$font-family: 'Roboto Condensed', sans-serif;
33
$monospace: 'Source Code Pro', monospace;
4-
5-
/**
6-
* Font definitions generated from https://google-webfonts-helper.herokuapp.com/fonts
7-
**/
8-
9-
/* roboto-condensed-regular - latin */
10-
@font-face {
11-
font-family: 'Roboto Condensed';
12-
font-style: normal;
13-
font-weight: 400;
14-
src: local('Roboto Condensed'), local('RobotoCondensed-Regular'),
15-
url('../assets/fonts/roboto-condensed-v14-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
16-
url('../assets/fonts/roboto-condensed-v14-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
17-
}
18-
/* roboto-condensed-700 - latin */
19-
@font-face {
20-
font-family: 'Roboto Condensed';
21-
font-style: normal;
22-
font-weight: 700;
23-
src: local('Roboto Condensed Bold'), local('RobotoCondensed-Bold'),
24-
url('../assets/fonts/roboto-condensed-v14-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
25-
url('../assets/fonts/roboto-condensed-v14-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
26-
}
27-
28-
/* source-code-pro-regular - latin */
29-
@font-face {
30-
font-family: 'Source Code Pro';
31-
font-style: normal;
32-
font-weight: 400;
33-
src: local('Source Code Pro'), local('SourceCodePro-Regular'),
34-
url('../assets/fonts/source-code-pro-v6-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
35-
url('../assets/fonts/source-code-pro-v6-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
36-
}
37-
/* source-code-pro-700 - latin */
38-
@font-face {
39-
font-family: 'Source Code Pro';
40-
font-style: normal;
41-
font-weight: 700;
42-
src: local('Source Code Pro Bold'), local('SourceCodePro-Bold'),
43-
url('../assets/fonts/source-code-pro-v6-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
44-
url('../assets/fonts/source-code-pro-v6-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
45-
}

‎index.html

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
gtag('config', 'UA-3579542-6');
1414
</script>
1515

16+
<link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&family=Source+Code+Pro:wght@200;400;700&display=swap" rel="stylesheet">
1617
<link rel="stylesheet" type="text/css" href="<%= css_file %>">
1718

1819
<!-- basic meta tags -->

‎package-lock.json

+483-275
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"license": "GPL-3.0",
77
"private": true,
88
"devDependencies": {
9-
"@babel/core": "^7.8.7",
10-
"@babel/preset-env": "^7.8.7",
11-
"@babel/register": "^7.8.6",
9+
"@babel/core": "^7.9.6",
10+
"@babel/preset-env": "^7.9.6",
11+
"@babel/register": "^7.9.0",
1212
"browser-sync": "^2.26.7",
1313
"del": "^4.1.1",
1414
"gulp": "^4.0.2",
1515
"gulp-autoprefixer": "^6.1.0",
16-
"gulp-clean-css": "^4.2.0",
16+
"gulp-clean-css": "^4.3.0",
1717
"gulp-htmlmin": "^5.0.1",
1818
"gulp-inject": "^5.0.5",
1919
"gulp-rename": "^1.4.0",
@@ -25,7 +25,7 @@
2525
"rollup-plugin-babel": "4.3.2",
2626
"rollup-plugin-replace": "^2.2.0",
2727
"rollup-plugin-terser": "^5.3.0",
28-
"sass": "^1.26.2",
28+
"sass": "^1.26.5",
2929
"vinyl": "^2.2.0"
3030
},
3131
"babel": {

‎server/composer.lock

+20-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.