From 45654ffc5cc4532c2189c88d46a0374038b53c9f Mon Sep 17 00:00:00 2001 From: Treer Date: Sat, 30 Apr 2016 21:36:19 +1000 Subject: update font-awesome library to 4.6.1 Perhaps this should be done as a submodule instead? --- .../src/assets/font-awesome/scss/_variables.scss | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'library/font_awesome/src/assets/font-awesome/scss/_variables.scss') diff --git a/library/font_awesome/src/assets/font-awesome/scss/_variables.scss b/library/font_awesome/src/assets/font-awesome/scss/_variables.scss index 30bab220a..9dfa9018d 100644 --- a/library/font_awesome/src/assets/font-awesome/scss/_variables.scss +++ b/library/font_awesome/src/assets/font-awesome/scss/_variables.scss @@ -3,14 +3,15 @@ // Variables // -------------------------- -$FontAwesomePath: "../font" !default; -$FontAwesomeVersion: "{{ site.fontawesome.version }}" !default; -$borderColor: #eeeeee !default; -$iconMuted: #eeeeee !default; -$iconLight: white !default; -$iconDark: #333333 !default; -$icons-li-width: (30em/14); +$fa-font-path: "../fonts" !default; +$fa-font-size-base: 14px !default; +$fa-line-height-base: 1 !default; +//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/{{site.fontawesome.version}}/fonts" !default; // for referencing Bootstrap CDN font files directly +$fa-css-prefix: {{ site.fontawesome.css_prefix }} !default; +$fa-version: "{{ site.fontawesome.version }}" !default; +$fa-border-color: #eee !default; +$fa-inverse: #fff !default; +$fa-li-width: (30em / 14) !default; -{% for icon in icons %} -${{ icon.id }}: "\{{ icon.unicode }}"; +{% assign sorted_icons = icons | expand_aliases | sort_by:'class' %}{% for icon in sorted_icons %}$fa-var-{{ icon.class }}: "\{{ icon.unicode }}"; {% endfor %} -- cgit v1.2.3