-
Notifications
You must be signed in to change notification settings - Fork 607
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #999 from mjschock/SassFix
Fix latest node-sass issues with Citadel upgrade and conditional impo…
- Loading branch information
Showing
4 changed files
with
20 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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"); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters