Merge branch 'master' of https://github.com/user-interviews/ui-design-system

Author: Dave Ferris

.babelrc

@@ -5,6 +5,12 @@
   ],
   "plugins": [
     "@babel/plugin-proposal-object-rest-spread",
+    ["module-resolver", {
+      "alias": {
+        "src": "./src",
+        "scss": "./scss"
+      }
+    }]
   ],
   "env": {
     "production": {

.storybook/webpack.config.js

@@ -7,10 +7,5 @@ module.exports = function({ config }) {
     include: path.resolve(__dirname, '../')
   });
 
-  config.resolve.modules = [
-    ...(config.resolve.modules || []),
-    path.resolve('./'),
-  ];
-
   return config;
 };

package.json

@@ -12,11 +12,11 @@
     "polished": "^3.4.2",
     "prop-types": "^15.7.2",
     "react-bootstrap": "^1.0.0-beta.16",
-    "react-transition-group": "^4.3.0",
     "react-copy-to-clipboard": "^5.0.2",
     "react-popper": "^1.3.7",
     "react-select": "^3.0.8",
     "react-tracking": "^7.3.0",
+    "react-transition-group": "^4.3.0",
     "uuid": "^7.0.2"
   },
   "scripts": {
@@ -66,6 +66,7 @@
     "@testing-library/react-hooks": "^3.2.1",
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
+    "babel-plugin-module-resolver": "^4.0.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-preset-react": "^6.24.1",
     "css-loader": "^3.4.2",

scss/colors/palette.scss

@@ -6,7 +6,7 @@ $ux-gray: #A1A1A1;
 $ux-green: #6DBD63;
 $ux-light-blue: #7CCBF2;
 $ux-orange: #F59C27;
-$ux-purple: #8B008B;
+$ux-purple: #874B96;
 $ux-red: #FF4E00;
 $ux-white: #FFFFFF;
 $ux-yellow: #F6D810;

src/CopyToClipboard/CopyToClipboard.scss

@@ -1,4 +1,4 @@
-@import 'scss/theme';
+@import '../../scss/theme';
 
 .CopyToClipboard {
   align-items: center;

src/Flash/Flash.scss

@@ -3,7 +3,7 @@
 @import '~bootstrap/scss/mixins';
 @import '~bootstrap/scss/alert';
 
-@import 'scss/theme';
+@import '../../scss/theme';
 
 $top-padding: 1.25rem;
 // Flash colors

src/FormGroup/FormGroup.scss

@@ -1,4 +1,4 @@
-@import 'scss/theme';
+@import '../../scss/theme';
 
 .FormGroup {
   margin: 1rem 0 0.5rem;

src/InputLabel/InputLabel.scss

@@ -1,4 +1,4 @@
-@import 'scss/theme';
+@import '../../scss/theme';
 
 .InputLabel {
   @include font-type-200;

src/Pill/Pill.scss

@@ -1,4 +1,4 @@
-@import 'scss/theme';
+@import '../../scss/theme';
 
 .Pill {
   display: inline;

src/Popper/Popper.scss

@@ -1,7 +1,7 @@
-@import 'scss/borders';
-@import 'scss/box_shadow';
-@import 'scss/colors';
-@import 'scss/typography';
+@import '../../scss/borders';
+@import '../../scss/box_shadow';
+@import '../../scss/colors';
+@import '../../scss/typography';
 
 .Popper {
   background-color: $ux-white;