diff --git a/nwb.config.js b/nwb.config.js index 8d6ddf0..a569cf2 100644 --- a/nwb.config.js +++ b/nwb.config.js @@ -18,6 +18,54 @@ module.exports = { autoprefixer: '> 1%, last 2 versions, Firefox ESR, ios >= 8', + config(config) { + // Change config as you wish + + // Select rules that match stylesheet files + const matchingLoaders = [ + 'sass-loader', + ].map(require.resolve); + + const newConfig = Object.assign({}, config); + newConfig.module.rules = config.module.rules.map((rule) => { + let enableSourceMap = false; + if (!rule.use) { + return rule; + } + return Object.assign({}, rule, { + use: rule.use.reduce((result, loaderDescriptor) => { + const resolvedLoader = require.resolve(loaderDescriptor.loader); + + // Make sure resolve-url-loader is inserted right before compatible loaders + if (matchingLoaders.indexOf(resolvedLoader) >= 0) { + result.push({ + loader: require.resolve('resolve-url-loader'), + options: { + fail: true, + silent: false, + }, + }); + enableSourceMap = true; + } + + const finalLoaderDescriptor = Object.assign({}, loaderDescriptor); + + // Avoid PostCSS discarding all source map information + if (enableSourceMap || resolvedLoader === require.resolve('postcss-loader')) { + finalLoaderDescriptor.options = finalLoaderDescriptor.options || {}; + finalLoaderDescriptor.options.sourceMap = true; + } + + result.push(finalLoaderDescriptor); + + return result; + }, []), + }); + }); + + return newConfig; + }, + extra: { resolve: { extensions: [ diff --git a/package-lock.json b/package-lock.json index 43e3231..c9afe90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -66,6 +66,52 @@ "integrity": "sha1-SACB6CtYe6MZRZ/vUS9Rb+A9WK8=", "dev": true }, + "adjust-sourcemap-loader": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.1.0.tgz", + "integrity": "sha1-QS2SQE62HkETY1ASy6U6M9AI4OI=", + "dev": true, + "requires": { + "assert": "1.4.1", + "camelcase": "1.2.1", + "loader-utils": "1.1.0", + "lodash.assign": "4.2.0", + "lodash.defaults": "3.1.2", + "object-path": "0.9.2", + "regex-parser": "2.2.7" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, + "lodash.defaults": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz", + "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=", + "dev": true, + "requires": { + "lodash.assign": "3.2.0", + "lodash.restparam": "3.6.1" + }, + "dependencies": { + "lodash.assign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz", + "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=", + "dev": true, + "requires": { + "lodash._baseassign": "3.2.0", + "lodash._createassigner": "3.1.1", + "lodash.keys": "3.1.2" + } + } + } + } + } + }, "after": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", @@ -327,6 +373,12 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, + "atob": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz", + "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=", + "dev": true + }, "autoprefixer": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.2.tgz", @@ -2540,6 +2592,29 @@ "randombytes": "2.0.5" } }, + "css": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz", + "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "source-map": "0.1.43", + "source-map-resolve": "0.3.1", + "urix": "0.1.0" + }, + "dependencies": { + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -6043,6 +6118,23 @@ "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", "dev": true }, + "lodash._bindcallback": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz", + "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=", + "dev": true + }, + "lodash._createassigner": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz", + "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=", + "dev": true, + "requires": { + "lodash._bindcallback": "3.0.1", + "lodash._isiterateecall": "3.0.9", + "lodash.restparam": "3.6.1" + } + }, "lodash._getnative": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", @@ -6090,6 +6182,12 @@ "lodash._isiterateecall": "3.0.9" } }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=", + "dev": true + }, "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -6125,6 +6223,12 @@ "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", "dev": true }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", + "dev": true + }, "lodash.tail": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", @@ -7142,6 +7246,12 @@ "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", "dev": true }, + "object-path": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz", + "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=", + "dev": true + }, "object.entries": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz", @@ -9296,6 +9406,12 @@ "is-primitive": "2.0.0" } }, + "regex-parser": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.7.tgz", + "integrity": "sha1-vQkOCRgYSazEVFfnZfe+KmP1DvE=", + "dev": true + }, "regexpu-core": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", @@ -9529,6 +9645,37 @@ "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.1.0.tgz", "integrity": "sha1-6DWIAbhrg7F1YNTjw4LXrvIQCUQ=" }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", + "dev": true + }, + "resolve-url-loader": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-2.1.0.tgz", + "integrity": "sha1-J8lcwWpDU5I/29wtuvXu8iIyxHc=", + "dev": true, + "requires": { + "adjust-sourcemap-loader": "1.1.0", + "camelcase": "4.1.0", + "convert-source-map": "1.5.0", + "loader-utils": "1.1.0", + "lodash.defaults": "4.2.0", + "rework": "1.0.1", + "rework-visit": "1.0.0", + "source-map": "0.5.6", + "urix": "0.1.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + } + } + }, "restore-cursor": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", @@ -9539,6 +9686,30 @@ "signal-exit": "3.0.2" } }, + "rework": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz", + "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=", + "dev": true, + "requires": { + "convert-source-map": "0.3.5", + "css": "2.2.1" + }, + "dependencies": { + "convert-source-map": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", + "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=", + "dev": true + } + } + }, + "rework-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz", + "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=", + "dev": true + }, "right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", @@ -10219,6 +10390,18 @@ "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", "dev": true }, + "source-map-resolve": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz", + "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=", + "dev": true, + "requires": { + "atob": "1.1.3", + "resolve-url": "0.2.1", + "source-map-url": "0.3.0", + "urix": "0.1.0" + } + }, "source-map-support": { "version": "0.4.16", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.16.tgz", @@ -10228,6 +10411,12 @@ "source-map": "0.5.6" } }, + "source-map-url": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz", + "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=", + "dev": true + }, "spdx-correct": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", @@ -10880,6 +11069,12 @@ "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", "dev": true }, + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "dev": true + }, "url": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", diff --git a/package.json b/package.json index 0aaf4ba..13920b5 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "file-loader": "^0.11.2", "nwb": "^0.18.10", "nwb-sass": "^0.8.1", + "resolve-url-loader": "^2.1.0", "svg-inline-loader": "^0.8.0" }, "dependencies": { diff --git a/src/App.jsx b/src/App.jsx index f30e2ab..627ccc4 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -11,7 +11,9 @@ import style from './App.sass'; WebFont.load({ google: { - families: ['Titillium Web:300,400,700', 'sans-serif'], + families: [ + 'Titillium Web:300,400,700', + ], }, }); @@ -64,7 +66,7 @@ class App extends React.Component { return (
- VIzon countdown + rizon VIzon countdown
diff --git a/src/Countdown.sass b/src/Countdown.sass index 6fe7f9a..8b8fd29 100644 --- a/src/Countdown.sass +++ b/src/Countdown.sass @@ -1,9 +1,8 @@ .countdown - display: flex - flex-direction: row - flex-wrap: wrap - font-family: monospace - justify-content: space-around + display: flex + flex-direction: row + flex-wrap: wrap + justify-content: space-around - &> *:not(:first-child) - margin-left: 0.25em + & > *:not(:first-child) + margin-left: 0.25em diff --git a/src/Header.sass b/src/Header.sass index 664f197..4dd03ff 100644 --- a/src/Header.sass +++ b/src/Header.sass @@ -1,7 +1,6 @@ .header color: #f8f8f8 - font-family: 'Titillium Web', sans-serif - font-weight: bold + font-family: 'Colaborate', sans-serif font-size: 1.5em text-align: center z-index: 2 diff --git a/src/fonts/_colaborate.sass b/src/fonts/_colaborate.sass new file mode 100644 index 0000000..033b79c --- /dev/null +++ b/src/fonts/_colaborate.sass @@ -0,0 +1,5 @@ +@import colaborate_bold_macroman/stylesheet +@import colaborate_medium_macroman/stylesheet +@import colaborate_regular_macroman/stylesheet +@import colaborate_light_macroman/stylesheet +@import colaborate_thin_macroman/stylesheet diff --git a/src/fonts/colaborate_bold_macroman/ColabBol-webfont.eot b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.eot new file mode 100644 index 0000000..de0e088 Binary files /dev/null and b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.eot differ diff --git a/src/fonts/colaborate_bold_macroman/ColabBol-webfont.svg b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.svg new file mode 100644 index 0000000..3c01157 --- /dev/null +++ b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.svg @@ -0,0 +1,928 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/fonts/colaborate_bold_macroman/ColabBol-webfont.ttf b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.ttf new file mode 100644 index 0000000..808c624 Binary files /dev/null and b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.ttf differ diff --git a/src/fonts/colaborate_bold_macroman/ColabBol-webfont.woff b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.woff new file mode 100644 index 0000000..196f97e Binary files /dev/null and b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.woff differ diff --git a/src/fonts/colaborate_bold_macroman/ColabBol-webfont.woff2 b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.woff2 new file mode 100644 index 0000000..71b7427 Binary files /dev/null and b/src/fonts/colaborate_bold_macroman/ColabBol-webfont.woff2 differ diff --git a/src/fonts/colaborate_bold_macroman/stylesheet.css b/src/fonts/colaborate_bold_macroman/stylesheet.css new file mode 100644 index 0000000..ece2139 --- /dev/null +++ b/src/fonts/colaborate_bold_macroman/stylesheet.css @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Colaborate'; + src: url('ColabBol-webfont.eot'); + src: url('ColabBol-webfont.eot?#iefix') format('embedded-opentype'), + url('ColabBol-webfont.woff2') format('woff2'), + url('ColabBol-webfont.woff') format('woff'), + url('ColabBol-webfont.ttf') format('truetype'), + url('ColabBol-webfont.svg#colaborate-boldregular') format('svg'); + font-weight: 700; + font-style: normal; +} diff --git a/src/fonts/colaborate_light_macroman/ColabLig-webfont.eot b/src/fonts/colaborate_light_macroman/ColabLig-webfont.eot new file mode 100644 index 0000000..e813dc9 Binary files /dev/null and b/src/fonts/colaborate_light_macroman/ColabLig-webfont.eot differ diff --git a/src/fonts/colaborate_light_macroman/ColabLig-webfont.svg b/src/fonts/colaborate_light_macroman/ColabLig-webfont.svg new file mode 100644 index 0000000..e4664c8 --- /dev/null +++ b/src/fonts/colaborate_light_macroman/ColabLig-webfont.svg @@ -0,0 +1,928 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/fonts/colaborate_light_macroman/ColabLig-webfont.ttf b/src/fonts/colaborate_light_macroman/ColabLig-webfont.ttf new file mode 100644 index 0000000..3b614c0 Binary files /dev/null and b/src/fonts/colaborate_light_macroman/ColabLig-webfont.ttf differ diff --git a/src/fonts/colaborate_light_macroman/ColabLig-webfont.woff b/src/fonts/colaborate_light_macroman/ColabLig-webfont.woff new file mode 100644 index 0000000..96db83d Binary files /dev/null and b/src/fonts/colaborate_light_macroman/ColabLig-webfont.woff differ diff --git a/src/fonts/colaborate_light_macroman/ColabLig-webfont.woff2 b/src/fonts/colaborate_light_macroman/ColabLig-webfont.woff2 new file mode 100644 index 0000000..9fbb83b Binary files /dev/null and b/src/fonts/colaborate_light_macroman/ColabLig-webfont.woff2 differ diff --git a/src/fonts/colaborate_light_macroman/stylesheet.css b/src/fonts/colaborate_light_macroman/stylesheet.css new file mode 100644 index 0000000..265e814 --- /dev/null +++ b/src/fonts/colaborate_light_macroman/stylesheet.css @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Colaborate'; + src: url('ColabLig-webfont.eot'); + src: url('ColabLig-webfont.eot?#iefix') format('embedded-opentype'), + url('ColabLig-webfont.woff2') format('woff2'), + url('ColabLig-webfont.woff') format('woff'), + url('ColabLig-webfont.ttf') format('truetype'), + url('ColabLig-webfont.svg#colaboratelightregular') format('svg'); + font-weight: 300; + font-style: normal; +} diff --git a/src/fonts/colaborate_medium_macroman/ColabMed-webfont.eot b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.eot new file mode 100644 index 0000000..481159c Binary files /dev/null and b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.eot differ diff --git a/src/fonts/colaborate_medium_macroman/ColabMed-webfont.svg b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.svg new file mode 100644 index 0000000..10c48b4 --- /dev/null +++ b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.svg @@ -0,0 +1,928 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/fonts/colaborate_medium_macroman/ColabMed-webfont.ttf b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.ttf new file mode 100644 index 0000000..9a7a5ba Binary files /dev/null and b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.ttf differ diff --git a/src/fonts/colaborate_medium_macroman/ColabMed-webfont.woff b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.woff new file mode 100644 index 0000000..1e97b2c Binary files /dev/null and b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.woff differ diff --git a/src/fonts/colaborate_medium_macroman/ColabMed-webfont.woff2 b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.woff2 new file mode 100644 index 0000000..5a8c2ed Binary files /dev/null and b/src/fonts/colaborate_medium_macroman/ColabMed-webfont.woff2 differ diff --git a/src/fonts/colaborate_medium_macroman/stylesheet.css b/src/fonts/colaborate_medium_macroman/stylesheet.css new file mode 100644 index 0000000..0dd7896 --- /dev/null +++ b/src/fonts/colaborate_medium_macroman/stylesheet.css @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Colaborate'; + src: url('ColabMed-webfont.eot'); + src: url('ColabMed-webfont.eot?#iefix') format('embedded-opentype'), + url('ColabMed-webfont.woff2') format('woff2'), + url('ColabMed-webfont.woff') format('woff'), + url('ColabMed-webfont.ttf') format('truetype'), + url('ColabMed-webfont.svg#colaborate-mediumregular') format('svg'); + font-weight: 500; + font-style: normal; +} diff --git a/src/fonts/colaborate_regular_macroman/ColabReg-webfont.eot b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.eot new file mode 100644 index 0000000..891c287 Binary files /dev/null and b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.eot differ diff --git a/src/fonts/colaborate_regular_macroman/ColabReg-webfont.svg b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.svg new file mode 100644 index 0000000..ab30b85 --- /dev/null +++ b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.svg @@ -0,0 +1,928 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/fonts/colaborate_regular_macroman/ColabReg-webfont.ttf b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.ttf new file mode 100644 index 0000000..6542b47 Binary files /dev/null and b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.ttf differ diff --git a/src/fonts/colaborate_regular_macroman/ColabReg-webfont.woff b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.woff new file mode 100644 index 0000000..62517b2 Binary files /dev/null and b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.woff differ diff --git a/src/fonts/colaborate_regular_macroman/ColabReg-webfont.woff2 b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.woff2 new file mode 100644 index 0000000..6a0d278 Binary files /dev/null and b/src/fonts/colaborate_regular_macroman/ColabReg-webfont.woff2 differ diff --git a/src/fonts/colaborate_regular_macroman/stylesheet.css b/src/fonts/colaborate_regular_macroman/stylesheet.css new file mode 100644 index 0000000..82dfdab --- /dev/null +++ b/src/fonts/colaborate_regular_macroman/stylesheet.css @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Colaborate'; + src: url('ColabReg-webfont.eot'); + src: url('ColabReg-webfont.eot?#iefix') format('embedded-opentype'), + url('ColabReg-webfont.woff2') format('woff2'), + url('ColabReg-webfont.woff') format('woff'), + url('ColabReg-webfont.ttf') format('truetype'), + url('ColabReg-webfont.svg#colaborate-regularregular') format('svg'); + font-weight: 400; + font-style: normal; +} diff --git a/src/fonts/colaborate_thin_macroman/ColabThi-webfont.eot b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.eot new file mode 100644 index 0000000..b39c286 Binary files /dev/null and b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.eot differ diff --git a/src/fonts/colaborate_thin_macroman/ColabThi-webfont.svg b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.svg new file mode 100644 index 0000000..d291e1f --- /dev/null +++ b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.svg @@ -0,0 +1,922 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/fonts/colaborate_thin_macroman/ColabThi-webfont.ttf b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.ttf new file mode 100644 index 0000000..ec06237 Binary files /dev/null and b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.ttf differ diff --git a/src/fonts/colaborate_thin_macroman/ColabThi-webfont.woff b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.woff new file mode 100644 index 0000000..0f1287a Binary files /dev/null and b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.woff differ diff --git a/src/fonts/colaborate_thin_macroman/ColabThi-webfont.woff2 b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.woff2 new file mode 100644 index 0000000..c21ae97 Binary files /dev/null and b/src/fonts/colaborate_thin_macroman/ColabThi-webfont.woff2 differ diff --git a/src/fonts/colaborate_thin_macroman/stylesheet.css b/src/fonts/colaborate_thin_macroman/stylesheet.css new file mode 100644 index 0000000..1ba98db --- /dev/null +++ b/src/fonts/colaborate_thin_macroman/stylesheet.css @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Colaborate'; + src: url('ColabThi-webfont.eot'); + src: url('ColabThi-webfont.eot?#iefix') format('embedded-opentype'), + url('ColabThi-webfont.woff2') format('woff2'), + url('ColabThi-webfont.woff') format('woff'), + url('ColabThi-webfont.ttf') format('truetype'), + url('ColabThi-webfont.svg#colaborate-thinregular') format('svg'); + font-weight: 100; + font-style: normal; +} diff --git a/src/index.sass b/src/index.sass index 43bf882..23f6d49 100644 --- a/src/index.sass +++ b/src/index.sass @@ -1,6 +1,7 @@ -@import "~normalize-scss/sass/normalize" +@import ~normalize-scss/sass/normalize +@import fonts/colaborate body - font-family: sans-serif - margin: 0 - padding: 0 \ No newline at end of file + font-family: sans-serif + margin: 0 + padding: 0