Skip to content

Commit 62521ac

Browse files
chore: Use local fonts and no analytics (#5333)
1 parent e28e40b commit 62521ac

13 files changed

+61
-12
lines changed

app/styles/app.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url('https://fonts.googleapis.com/css?family=Lato:100,300,400,700,900'); // sass-lint:disable-line no-url-domains,no-url-protocols
1+
@import 'font';
22
@import 'vars';
33
@import 'libs/helpers';
44
@import 'libs/stripe_connect';

app/styles/font.scss

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// sass-lint:disable indentation no-css-comments
2+
3+
/* lato-100 - latin */
4+
@font-face {
5+
font-family: 'Lato';
6+
font-style: normal;
7+
font-weight: 100;
8+
src: local('Lato Hairline'), local('Lato-Hairline'),
9+
url('../fonts/lato-v17-latin-100.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
10+
url('../fonts/lato-v17-latin-100.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
11+
}
12+
/* lato-300 - latin */
13+
@font-face {
14+
font-family: 'Lato';
15+
font-style: normal;
16+
font-weight: 300;
17+
src: local('Lato Light'), local('Lato-Light'),
18+
url('../fonts/lato-v17-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
19+
url('../fonts/lato-v17-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
20+
}
21+
/* lato-regular - latin */
22+
@font-face {
23+
font-family: 'Lato';
24+
font-style: normal;
25+
font-weight: 400;
26+
src: local('Lato Regular'), local('Lato-Regular'),
27+
url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
28+
url('../fonts/lato-v17-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
29+
}
30+
/* lato-700 - latin */
31+
@font-face {
32+
font-family: 'Lato';
33+
font-style: normal;
34+
font-weight: 700;
35+
src: local('Lato Bold'), local('Lato-Bold'),
36+
url('../fonts/lato-v17-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
37+
url('../fonts/lato-v17-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
38+
}
39+
/* lato-900 - latin */
40+
@font-face {
41+
font-family: 'Lato';
42+
font-style: normal;
43+
font-weight: 900;
44+
src: local('Lato Black'), local('Lato-Black'),
45+
url('../fonts/lato-v17-latin-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
46+
url('../fonts/lato-v17-latin-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
47+
}

config/environment.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,6 @@ module.exports = function(environment) {
3333
version : process.env.npm_package_version
3434
},
3535

36-
metricsAdapters: [{
37-
name : 'GoogleAnalytics',
38-
environments : ['production'],
39-
config : {
40-
id : process.env.GOOGLE_ANALYTICS_PROPERTY_ID || 'UA-XXXX-Y',
41-
debug : environment === 'development',
42-
trace : environment === 'development',
43-
sendHitTask : environment !== 'development'
44-
}
45-
}],
46-
4736
moment: {
4837
includeTimezone: 'subset'
4938
/* ,
@@ -136,5 +125,18 @@ module.exports = function(environment) {
136125
}
137126
}
138127

128+
if (process.env.GOOGLE_ANALYTICS_PROPERTY_ID) {
129+
ENV.metricsAdapters = [{
130+
name : 'GoogleAnalytics',
131+
environments : ['production'],
132+
config : {
133+
id : process.env.GOOGLE_ANALYTICS_PROPERTY_ID || 'UA-XXXX-Y',
134+
debug : environment === 'development',
135+
trace : environment === 'development',
136+
sendHitTask : environment !== 'development'
137+
}
138+
}];
139+
}
140+
139141
return ENV;
140142
};
26.4 KB
Binary file not shown.
21.1 KB
Binary file not shown.
29.3 KB
Binary file not shown.
22.7 KB
Binary file not shown.
27.4 KB
Binary file not shown.
22.5 KB
Binary file not shown.
26.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)