From f367543791a9a6ca96f687ec5cf305a3996470ad Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Fri, 16 Sep 2016 12:23:30 -0400
Subject: [PATCH] Rearrange variables to fix font-awesome load path.
---
Gruntfile.js | 9 +++++++--
themes/bootstrap3/less/bootstrap.less | 6 +++---
themes/bootstrap3/scss/bootstrap.scss | 6 +++---
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index fade7c68176..21bcf23e926 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -100,8 +100,13 @@ module.exports = function(grunt) {
order: 4
},
{
- pattern: '$fa-font-path: "../../../fonts" !default;',
- replacement: '$fa-font-path: "fonts";',
+ pattern: '$fa-font-path: "../../../fonts" !default;\n',
+ replacement: '',
+ order: 4
+ },
+ {
+ pattern: '@import "vendor/font-awesome/font-awesome";',
+ replacement: '$fa-font-path: "fonts";\n@import "vendor/font-awesome/font-awesome";',
order: 4
},
{
diff --git a/themes/bootstrap3/less/bootstrap.less b/themes/bootstrap3/less/bootstrap.less
index 71c5b69ebc6..6c4af3e9b8b 100644
--- a/themes/bootstrap3/less/bootstrap.less
+++ b/themes/bootstrap3/less/bootstrap.less
@@ -1,11 +1,11 @@
-@fa-font-path: "../../../fonts";
-@img-path: "../../images";
-
@import "vendor/bootstrap/bootstrap";
@import "vendor/font-awesome/font-awesome";
@import "vendor/bootstrap-accessibility/bootstrap-accessibility";
@import "vendor/a11y";
+@fa-font-path: "../../../fonts";
+@img-path: "../../images";
+
@import "components/advanced-search";
@import "components/alphabrowse";
@import "components/autocomplete";
diff --git a/themes/bootstrap3/scss/bootstrap.scss b/themes/bootstrap3/scss/bootstrap.scss
index 651e5dd1e5a..eeae21f130c 100644
--- a/themes/bootstrap3/scss/bootstrap.scss
+++ b/themes/bootstrap3/scss/bootstrap.scss
@@ -1,11 +1,11 @@
-$fa-font-path: "fonts";
-$img-path: "../images";
-
@import "vendor/bootstrap";
+$fa-font-path: "fonts";
@import "vendor/font-awesome/font-awesome";
@import "vendor/bootstrap-accessibility/bootstrap-accessibility";
@import "vendor/a11y";
+$img-path: "../images";
+
@import "components/advanced-search";
@import "components/alphabrowse";
@import "components/autocomplete";
--
GitLab