Add option for custom $icon-font-path

Add configuration option to disable the addition of the default $icon-font-path so we can use our own custom path within our Sass files.
shakacode · Feb 5, 2016 · 8bd18ff · 8bd18ff
1 parent 33a9529
commit 8bd18ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/bootstrap.config.js b/src/bootstrap.config.js
@@ -86,6 +86,7 @@ export function createConfig({
       bootstrapCustomizations,
       appStyles,
       useFlexbox: rawConfig.useFlexbox,
+      useCustomIconFontPath: rawConfig.useCustomIconFontPath,
       extractStyles: extractStyles || getEnvProp('extractStyles', rawConfig),
       styleLoaders: rawConfig.styleLoaders,
       styles: selectUserModules(rawConfig.styles, defaultConfig.styles),
@@ -99,6 +100,7 @@ export function createConfig({
     bootstrapVersion,
     loglevel,
     useFlexbox: defaultConfig.useFlexbox,
+    useCustomIconFontPath: defaultConfig.useCustomIconFontPath,
     extractStyles: extractStyles || getEnvProp('extractStyles', defaultConfig),
     styleLoaders: defaultConfig.styleLoaders,
     styles: selectModules(defaultConfig.styles),

diff --git a/src/bootstrap.styles.loader.js b/src/bootstrap.styles.loader.js
@@ -20,6 +20,7 @@ module.exports = function() {
     styles,
     bootstrapRelPath,
     useFlexbox,
+    useCustomIconFontPath,
     preBootstrapCustomizations,
     bootstrapCustomizations,
     appStyles,
@@ -47,7 +48,7 @@ module.exports = function() {
     createBootstrapImport('variables', bootstrapVersion, bootstrapRelPath)
   );
 
-  if (bootstrapVersion === 3) {
+  if (bootstrapVersion === 3 && !useCustomIconFontPath) {
     processedStyles.push(
       `$icon-font-path: "${getFontsPath(bootstrapRelPath, this)}";`
     );