Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url('https://fonts.googleapis.com/css?family=Lato:100,300,400,700,900'); // sass-lint:disable-line no-url-domains,no-url-protocols
@import 'font';
@import 'vars';
@import 'libs/helpers';
@import 'libs/stripe_connect';
Expand Down
47 changes: 47 additions & 0 deletions app/styles/font.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// sass-lint:disable indentation no-css-comments

/* lato-100 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 100;
src: local('Lato Hairline'), local('Lato-Hairline'),
url('../fonts/lato-v17-latin-100.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('../fonts/lato-v17-latin-100.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* lato-300 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 300;
src: local('Lato Light'), local('Lato-Light'),
url('../fonts/lato-v17-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('../fonts/lato-v17-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* lato-regular - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 400;
src: local('Lato Regular'), local('Lato-Regular'),
url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('../fonts/lato-v17-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* lato-700 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 700;
src: local('Lato Bold'), local('Lato-Bold'),
url('../fonts/lato-v17-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('../fonts/lato-v17-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* lato-900 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 900;
src: local('Lato Black'), local('Lato-Black'),
url('../fonts/lato-v17-latin-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('../fonts/lato-v17-latin-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
24 changes: 13 additions & 11 deletions config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,6 @@ module.exports = function(environment) {
version : process.env.npm_package_version
},

metricsAdapters: [{
name : 'GoogleAnalytics',
environments : ['production'],
config : {
id : process.env.GOOGLE_ANALYTICS_PROPERTY_ID || 'UA-XXXX-Y',
debug : environment === 'development',
trace : environment === 'development',
sendHitTask : environment !== 'development'
}
}],

moment: {
includeTimezone: 'subset'
/* ,
Expand Down Expand Up @@ -136,5 +125,18 @@ module.exports = function(environment) {
}
}

if (process.env.GOOGLE_ANALYTICS_PROPERTY_ID) {
ENV.metricsAdapters = [{
name : 'GoogleAnalytics',
environments : ['production'],
config : {
id : process.env.GOOGLE_ANALYTICS_PROPERTY_ID || 'UA-XXXX-Y',
debug : environment === 'development',
trace : environment === 'development',
sendHitTask : environment !== 'development'
}
}];
}

return ENV;
};
Binary file added public/fonts/lato-v17-latin-100.woff
Binary file not shown.
Binary file added public/fonts/lato-v17-latin-100.woff2
Binary file not shown.
Binary file added public/fonts/lato-v17-latin-300.woff
Binary file not shown.
Binary file added public/fonts/lato-v17-latin-300.woff2
Binary file not shown.
Binary file added public/fonts/lato-v17-latin-700.woff
Binary file not shown.
Binary file added public/fonts/lato-v17-latin-700.woff2
Binary file not shown.
Binary file added public/fonts/lato-v17-latin-900.woff
Binary file not shown.
Binary file added public/fonts/lato-v17-latin-900.woff2
Binary file not shown.
Binary file added public/fonts/lato-v17-latin-regular.woff
Binary file not shown.
Binary file added public/fonts/lato-v17-latin-regular.woff2
Binary file not shown.