From 4692413b524f6536addf31387ed37dc4834e0e85 Mon Sep 17 00:00:00 2001 From: Xaver Maierhofer Date: Fri, 3 Jun 2016 00:28:59 +0200 Subject: [PATCH] [!!!][TASK] Refactor fonts - Add woff2 for RobotoSlab - Default font as option/variable --- bower.json | 2 +- html/index.html | 2 -- scss/main.scss | 13 +++++++++---- scss/mixins/_font.scss | 17 +++++++++++++++++ scss/mixins/{_icon-mixin.scss => _icon.scss} | 0 scss/modules/_variables.scss | 3 +++ scss/modules/font/_font.scss | 7 +++++++ scss/modules/font/_icon.scss | 1 + scss/modules/icon.scss | 1 - tasks/build.js | 13 +++++++------ 10 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 scss/mixins/_font.scss rename scss/mixins/{_icon-mixin.scss => _icon.scss} (100%) create mode 100644 scss/modules/font/_font.scss create mode 120000 scss/modules/font/_icon.scss delete mode 120000 scss/modules/icon.scss diff --git a/bower.json b/bower.json index 62b134f..a9cbfea 100644 --- a/bower.json +++ b/bower.json @@ -14,7 +14,7 @@ "moment": "~2.13.0", "requirejs": "~2.2.0", "tablesort": "https://github.com/tristen/tablesort.git#v4.0.1", - "roboto-slab-fontface": "*", + "roboto-slab-fontface-kit": "*", "es6-shim": "~0.35.1", "almond": "~0.3.2", "d3": "~3.5.17", diff --git a/html/index.html b/html/index.html index 75008e5..37fc2dc 100644 --- a/html/index.html +++ b/html/index.html @@ -3,8 +3,6 @@ - -