From 562bdf609072a73dc88d7a01c82e14b70dd73ad9 Mon Sep 17 00:00:00 2001
From: Michael Schock <michael.schock@bigcommerce.com>
Date: Fri, 21 Apr 2017 14:21:49 -0700
Subject: [PATCH] Fix latest node-sass issues with Citadel upgrade and
 conditional import swap with mixin

---
 CHANGELOG.md                       |  1 +
 assets/scss/fonts/_clear-sans.scss | 28 +++++++++++++++-------------
 assets/scss/fonts/_fonts.scss      |  4 +++-
 package.json                       |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98c488d3de..816e9f8c87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Draft
+- Fix latest node-sass issues with Citadel upgrade and conditional import swap with mixin [#999](https://github.com/bigcommerce/cornerstone/pull/999)
 - Repopulate review form fields after error [#996](https://github.com/bigcommerce/cornerstone/pull/996)
 - Fix product quick view 'Write a Review' link [#995](https://github.com/bigcommerce/cornerstone/pull/995)
 - Update bigcommerce.com footer link [#990](https://github.com/bigcommerce/cornerstone/pull/990)
diff --git a/assets/scss/fonts/_clear-sans.scss b/assets/scss/fonts/_clear-sans.scss
index b66b366d6a..148a9ae497 100644
--- a/assets/scss/fonts/_clear-sans.scss
+++ b/assets/scss/fonts/_clear-sans.scss
@@ -1,15 +1,17 @@
-@font-face {
-    font-family: "Clear Sans";
-    font-style: normal;
-    font-weight: 400;
-    src: url("../fonts/clearsans-regular-webfont.woff2") format("woff2"),
-         url("../fonts/clearsans-regular-webfont.woff") format("woff");
-}
+@mixin clear-sans {
+    @font-face {
+        font-family: "Clear Sans";
+        font-style: normal;
+        font-weight: 400;
+        src: url("../fonts/clearsans-regular-webfont.woff2") format("woff2"),
+            url("../fonts/clearsans-regular-webfont.woff") format("woff");
+    }
 
-@font-face {
-    font-family: "Clear Sans";
-    font-style: normal;
-    font-weight: 700;
-    src: url("../fonts/clearsans-bold-webfont.woff2") format("woff2"),
-         url("../fonts/clearsans-bold-webfont.woff") format("woff");
+    @font-face {
+        font-family: "Clear Sans";
+        font-style: normal;
+        font-weight: 700;
+        src: url("../fonts/clearsans-bold-webfont.woff2") format("woff2"),
+            url("../fonts/clearsans-bold-webfont.woff") format("woff");
+    }
 }
diff --git a/assets/scss/fonts/_fonts.scss b/assets/scss/fonts/_fonts.scss
index 73cd8ca4b2..eeeb9b427f 100644
--- a/assets/scss/fonts/_fonts.scss
+++ b/assets/scss/fonts/_fonts.scss
@@ -1,5 +1,7 @@
+@import "clear-sans";
+
 $fonts: $fontFamily-sans $fontFamily-serif $fontFamily-mono $fontFamily-headings $fontFamily-hero;
 
 @if contains($fonts, "'Clear Sans', sans-serif") {
-    @import "clear-sans";
+    @include clear-sans;
 }
diff --git a/package.json b/package.json
index 2805dbb146..4d0164b99a 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "author": "BigCommerce",
   "license": "MIT",
   "devDependencies": {
-    "@bigcommerce/citadel": "^2.11.5",
+    "@bigcommerce/citadel": "^2.15.1",
     "@bigcommerce/stencil-utils": "1.0.5",
     "async": "^1.5.2",
     "babel-core": "6.7.4",