Merge pull request #1203 from undp/develop

Release 1.1.3

.storybook/main.js

@@ -30,6 +30,10 @@ module.exports = {
     //     config.module.rules[index].options.name = 'static/media/[name].[ext]';
     //   }
     // });
+    config.resolve.alias = {
+      ...config.resolve.alias,
+      icons: path.resolve(__dirname, "../stories/assets/icons"),
+    };
     // add SCSS support for CSS Modules
     config.module.rules.push({
       test: /\.scss$/,

.storybook/preview.js

@@ -4,8 +4,8 @@ import { initializeRTL } from 'storybook-addon-rtl';
 // import { addParameters } from '@storybook/react'
 import renderToHTML from './renderToHTML'
 
-// include fonts globally
-import '../stories/assets/scss/_fonts.scss';
+// include base styling globally
+import '!style-loader!css-loader!sass-loader!../stories/assets/scss/base-minimal.scss';
 
 // initialise RTL
 initializeRTL();
@@ -82,7 +82,7 @@ export const globalTypes = {
 
 /**
  * Function to get current language code.
- * 
+ *
  * @param {*} Story renders Stories in iFrame.
  * @param {*} context Current context for Addons.
  * @returns Current Language Code.
@@ -172,28 +172,28 @@ const setDirection = (Story, options) => {
 
 /**
  * Function to set a global "accent-COLOR" class to the body.
- * 
+ *
  * @param {*} Story renders Stories in iFrame.
  * @param {*} context Current context for Addons.
  * @returns Story with accent color processed.
  */
 const setAccentClass = (Story, context) => {
   let accent = context.globals.accent;
   const bodyElem = document.querySelector('body');
-  
+
   // Remove any prexisting accent-COLOR items so we can apply the most recent
   // global selection.
   bodyElem.classList.forEach((item) => {
     if (item.startsWith('accent-')) {
       bodyElem.classList.remove(item);
     }
   });
-  
+
   if (Boolean(accent)) {
     // Set accent class on body tag (the most parent of parents).
     bodyElem.classList.add(`accent-${accent}`);
   }
-  
+
   return (
     <Story {...context} />
   )