diff --git a/app/styles/app.scss b/app/styles/app.scss index b35e99dd8d5..aefda72a822 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -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'; diff --git a/app/styles/font.scss b/app/styles/font.scss new file mode 100644 index 00000000000..be5bfc088f4 --- /dev/null +++ b/app/styles/font.scss @@ -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+ */ +} diff --git a/config/environment.js b/config/environment.js index b24ac09ea3b..6ce1b581527 100644 --- a/config/environment.js +++ b/config/environment.js @@ -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' /* , @@ -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; }; diff --git a/public/fonts/lato-v17-latin-100.woff b/public/fonts/lato-v17-latin-100.woff new file mode 100644 index 00000000000..71b25faf195 Binary files /dev/null and b/public/fonts/lato-v17-latin-100.woff differ diff --git a/public/fonts/lato-v17-latin-100.woff2 b/public/fonts/lato-v17-latin-100.woff2 new file mode 100644 index 00000000000..3dbe168fcbd Binary files /dev/null and b/public/fonts/lato-v17-latin-100.woff2 differ diff --git a/public/fonts/lato-v17-latin-300.woff b/public/fonts/lato-v17-latin-300.woff new file mode 100644 index 00000000000..a18ddb12e64 Binary files /dev/null and b/public/fonts/lato-v17-latin-300.woff differ diff --git a/public/fonts/lato-v17-latin-300.woff2 b/public/fonts/lato-v17-latin-300.woff2 new file mode 100644 index 00000000000..a7f756c4d12 Binary files /dev/null and b/public/fonts/lato-v17-latin-300.woff2 differ diff --git a/public/fonts/lato-v17-latin-700.woff b/public/fonts/lato-v17-latin-700.woff new file mode 100644 index 00000000000..abf0196d832 Binary files /dev/null and b/public/fonts/lato-v17-latin-700.woff differ diff --git a/public/fonts/lato-v17-latin-700.woff2 b/public/fonts/lato-v17-latin-700.woff2 new file mode 100644 index 00000000000..f8c37ecde4d Binary files /dev/null and b/public/fonts/lato-v17-latin-700.woff2 differ diff --git a/public/fonts/lato-v17-latin-900.woff b/public/fonts/lato-v17-latin-900.woff new file mode 100644 index 00000000000..6f201e0709c Binary files /dev/null and b/public/fonts/lato-v17-latin-900.woff differ diff --git a/public/fonts/lato-v17-latin-900.woff2 b/public/fonts/lato-v17-latin-900.woff2 new file mode 100644 index 00000000000..2f647be58b7 Binary files /dev/null and b/public/fonts/lato-v17-latin-900.woff2 differ diff --git a/public/fonts/lato-v17-latin-regular.woff b/public/fonts/lato-v17-latin-regular.woff new file mode 100644 index 00000000000..189a0feb590 Binary files /dev/null and b/public/fonts/lato-v17-latin-regular.woff differ diff --git a/public/fonts/lato-v17-latin-regular.woff2 b/public/fonts/lato-v17-latin-regular.woff2 new file mode 100644 index 00000000000..6904b6649ff Binary files /dev/null and b/public/fonts/lato-v17-latin-regular.woff2 differ