aboutsummaryrefslogtreecommitdiff
path: root/app/assets/sass
diff options
context:
space:
mode:
authorAlex Tatiyants <atatiyan@gmail.com>2016-01-05 22:14:24 -0800
committerAlex Tatiyants <atatiyan@gmail.com>2016-01-05 22:14:24 -0800
commitf1e99eaf19f8af7c7cbad8a3aec14ca03c0451ad (patch)
tree6a7295469546ed5d5d2c9e526d82622ba5e364a3 /app/assets/sass
parent6808fd285d54182da5dca9e4190ad9d766c4c783 (diff)
add fonts
Diffstat (limited to 'app/assets/sass')
-rw-r--r--app/assets/sass/_fonts.scss41
-rw-r--r--app/assets/sass/_variables.scss4
-rw-r--r--app/assets/sass/styles.scss1
3 files changed, 44 insertions, 2 deletions
diff --git a/app/assets/sass/_fonts.scss b/app/assets/sass/_fonts.scss
new file mode 100644
index 0000000..ffe3923
--- /dev/null
+++ b/app/assets/sass/_fonts.scss
@@ -0,0 +1,41 @@
+@font-face {
+ font-family: 'noto';
+ src: url('../fonts/noto-sans-regular.ttf') format('truetype');
+ font-weight: 300;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'noto';
+ src: url('../fonts/noto-sans-italic.ttf') format('truetype');
+ font-weight: 300;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'noto';
+ src: url('../fonts/noto-sans-700.ttf') format('truetype');
+ font-weight: 600;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'noto';
+ src: url('../fonts/noto-sans-700italic.ttf') format('truetype');
+ font-weight: 600;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'source code';
+ src: url('../fonts/source-code-pro-300.ttf') format('truetype');
+ font-weight: 300;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'source code';
+ src: url('../fonts/source-code-pro-500.ttf') format('truetype');
+ font-weight: 600;
+ font-style: normal;
+}
diff --git a/app/assets/sass/_variables.scss b/app/assets/sass/_variables.scss
index 3a02de8..4baf525 100644
--- a/app/assets/sass/_variables.scss
+++ b/app/assets/sass/_variables.scss
@@ -12,8 +12,8 @@ $font-size-sm: round($font-size-base * 0.9);
$font-size-lg: round($font-size-base * 1.3);
$font-size-xl: round($font-size-base * 1.7);
-$font-family-sans-serif: 'noto sans';
-$font-family-mono: 'source code pro';
+$font-family-sans-serif: 'noto';
+$font-family-mono: 'source code';
$line-height-base: 1.3;
diff --git a/app/assets/sass/styles.scss b/app/assets/sass/styles.scss
index cd58edf..cb7b192 100644
--- a/app/assets/sass/styles.scss
+++ b/app/assets/sass/styles.scss
@@ -2,6 +2,7 @@
@import "font-awesome/styles";
@import "variables";
+@import "fonts";
@import "common";
@import "buttons";
@import "forms";