about summary refs log tree commit diff
path: root/app/javascript/styles/fonts
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-05-03 02:04:16 +0200
committerGitHub <noreply@github.com>2017-05-03 02:04:16 +0200
commitf5bf5ebb82e3af420dcd23d602b1be6cc86838e1 (patch)
tree92eef08642a038cf44ccbc6d16a884293e7a0814 /app/javascript/styles/fonts
parent26bc5915727e0a0173c03cb49f5193dd612fb888 (diff)
Replace sprockets/browserify with Webpack (#2617)
* Replace browserify with webpack

* Add react-intl-translations-manager

* Do not minify in development, add offline-plugin for ServiceWorker background cache updates

* Adjust tests and dependencies

* Fix production deployments

* Fix tests

* More optimizations

* Improve travis cache for npm stuff

* Re-run travis

* Add back support for custom.scss as before

* Remove offline-plugin and babili

* Fix issue with Immutable.List().unshift(...values) not working as expected

* Make travis load schema instead of running all migrations in sequence

* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />

* Add react definitions to places that use JSX

* Add Procfile.dev for running rails, webpack and streaming API at the same time
Diffstat (limited to 'app/javascript/styles/fonts')
-rw-r--r--app/javascript/styles/fonts/montserrat.scss11
-rw-r--r--app/javascript/styles/fonts/roboto-mono.scss12
-rw-r--r--app/javascript/styles/fonts/roboto.scss52
3 files changed, 75 insertions, 0 deletions
diff --git a/app/javascript/styles/fonts/montserrat.scss b/app/javascript/styles/fonts/montserrat.scss
new file mode 100644
index 000000000..7496e0800
--- /dev/null
+++ b/app/javascript/styles/fonts/montserrat.scss
@@ -0,0 +1,11 @@
+@font-face {
+  font-family: 'Montserrat';
+  src: local('Montserrat');
+  src: url('../fonts/montserrat/Montserrat-Regular.eot');
+  src: url('../fonts/montserrat/Montserrat-Regular.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/montserrat/Montserrat-Regular.woff2') format('woff2'),
+  url('../fonts/montserrat/Montserrat-Regular.woff') format('woff'),
+  url('../fonts/montserrat/Montserrat-Regular.ttf') format('truetype');
+  font-weight: 400;
+  font-style: normal;
+}
diff --git a/app/javascript/styles/fonts/roboto-mono.scss b/app/javascript/styles/fonts/roboto-mono.scss
new file mode 100644
index 000000000..846519d9f
--- /dev/null
+++ b/app/javascript/styles/fonts/roboto-mono.scss
@@ -0,0 +1,12 @@
+@font-face {
+  font-family: 'Roboto Mono';
+  src: local('Roboto Mono');
+  src: url('../fonts/roboto-mono/robotomono-regular-webfont.eot');
+  src: url('../fonts/roboto-mono/robotomono-regular-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
+  url('../fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
+  url('../fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
+  url('../fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg');
+  font-weight: 400;
+  font-style: normal;
+}
diff --git a/app/javascript/styles/fonts/roboto.scss b/app/javascript/styles/fonts/roboto.scss
new file mode 100644
index 000000000..6198a580f
--- /dev/null
+++ b/app/javascript/styles/fonts/roboto.scss
@@ -0,0 +1,52 @@
+@font-face {
+  font-family: 'Roboto';
+  src: local('Roboto');
+  src: url('../fonts/roboto/roboto-italic-webfont.eot');
+  src: url('../fonts/roboto/roboto-italic-webfont.eot?#iefix') format('embedded-opentype'),
+    url('../fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
+    url('../fonts/roboto/roboto-italic-webfont.woff') format('woff'),
+    url('../fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
+    url('../fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg');
+  font-weight: normal;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: local('Roboto');
+  src: url('../fonts/roboto/roboto-bold-webfont.eot');
+  src: local('Roboto bold'), local('roboto-bold'),
+    url('../fonts/roboto/roboto-bold-webfont.eot?#iefix') format('embedded-opentype'),
+    url('../fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
+    url('../fonts/roboto/roboto-bold-webfont.woff') format('woff'),
+    url('../fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
+    url('../fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg');
+  font-weight: bold;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: local('Roboto');
+  src: url('../fonts/roboto/roboto-medium-webfont.eot');
+  src: url('../fonts/roboto/roboto-medium-webfont.eot?#iefix') format('embedded-opentype'),
+    url('../fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
+    url('../fonts/roboto/roboto-medium-webfont.woff') format('woff'),
+    url('../fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
+    url('../fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg');
+  font-weight: 500;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: local('Roboto');
+  src: url('../fonts/roboto/roboto-regular-webfont.eot');
+  src: url('../fonts/roboto/roboto-regular-webfont.eot?#iefix') format('embedded-opentype'),
+    url('../fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
+    url('../fonts/roboto/roboto-regular-webfont.woff') format('woff'),
+    url('../fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
+    url('../fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}