Merge pull request #28 from Wikia/IW-1589

vforge · web-flow · commit 4f2a4f635440 · 2019-02-15T12:43:16.000-08:00
IW-1589 | icons update
diff --git a/docs/build/1.14b5634f.js b/docs/build/1.14b5634f.js
diff --git a/docs/build/1.8213be0c.js b/docs/build/1.8213be0c.js
diff --git a/docs/build/bundle.0cd9f7dd.js b/docs/build/bundle.0cd9f7dd.js
diff --git a/docs/build/bundle.29ce3c8d.js b/docs/build/bundle.29ce3c8d.js
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-common</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:400,700"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.29ce3c8d.js"></script></body></html>
+<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-common</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:400,700"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.0cd9f7dd.js"></script></body></html>
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "classnames": "^2.2.6",
     "concurrently": "^4.1.0",
     "coveralls": "^3.0.2",
-    "design-system": "git://github.com/Wikia/design-system.git#IW-1261",
+    "design-system": "git://github.com/Wikia/design-system.git#IW-1589",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.7.0",
     "enzyme-redux": "^0.2.1",
diff --git a/source/components/BannerNotification/index.js b/source/components/BannerNotification/index.js
@@ -4,14 +4,15 @@ import PropTypes from 'prop-types';
 import IconCloseTiny from '../../icons/IconCloseTiny';
 import IconAlertSmall from '../../icons/IconAlertSmall';
 import IconCheckmarkSmall from '../../icons/IconCheckmarkSmall';
+import IconErrorSmall from '../../icons/IconErrorSmall';
 import IconFlagSmall from '../../icons/IconFlagSmall';
 
 import './styles.scss';
 
 function getIcon(type) {
     switch (type) {
         case ('alert'):
-            return <IconAlertSmall className="wds-banner-notification__icon-mark" />;
+            return <IconErrorSmall className="wds-banner-notification__icon-mark" />;
         case ('warning'):
             return <IconAlertSmall className="wds-banner-notification__icon-mark" />;
         case ('success'):
diff --git a/source/icons/IconError/README.md b/source/icons/IconError/README.md
@@ -0,0 +1,4 @@
+
+```js
+<IconError height="30" />
+```
diff --git a/source/icons/IconError/index.js b/source/icons/IconError/index.js
@@ -0,0 +1,6 @@
+// This file is generated automatically via extract-assets-from-ds.js
+import React from 'react';
+import IconError from 'design-system/dist/svg/wds-icons-error.svg';
+
+/** @component */
+export default props => <IconError {...props} />;
diff --git a/source/icons/IconErrorSmall/README.md b/source/icons/IconErrorSmall/README.md
@@ -0,0 +1,4 @@
+
+```js
+<IconErrorSmall height="30" />
+```
diff --git a/source/icons/IconErrorSmall/index.js b/source/icons/IconErrorSmall/index.js
@@ -0,0 +1,6 @@
+// This file is generated automatically via extract-assets-from-ds.js
+import React from 'react';
+import IconErrorSmall from 'design-system/dist/svg/wds-icons-error-small.svg';
+
+/** @component */
+export default props => <IconErrorSmall {...props} />;
diff --git a/source/icons/IconErrorTiny/README.md b/source/icons/IconErrorTiny/README.md
@@ -0,0 +1,4 @@
+
+```js
+<IconErrorTiny height="30" />
+```
diff --git a/source/icons/IconErrorTiny/index.js b/source/icons/IconErrorTiny/index.js
@@ -0,0 +1,6 @@
+// This file is generated automatically via extract-assets-from-ds.js
+import React from 'react';
+import IconErrorTiny from 'design-system/dist/svg/wds-icons-error-tiny.svg';
+
+/** @component */
+export default props => <IconErrorTiny {...props} />;
diff --git a/source/icons/index.js b/source/icons/index.js
@@ -79,6 +79,9 @@ export { default as IconDropdown } from './IconDropdown';
 export { default as IconEnvelopeSmall } from './IconEnvelopeSmall';
 export { default as IconEnvelopeTiny } from './IconEnvelopeTiny';
 export { default as IconEnvelope } from './IconEnvelope';
+export { default as IconErrorSmall } from './IconErrorSmall';
+export { default as IconErrorTiny } from './IconErrorTiny';
+export { default as IconError } from './IconError';
 export { default as IconExternalSmall } from './IconExternalSmall';
 export { default as IconExternalTiny } from './IconExternalTiny';
 export { default as IconExternal } from './IconExternal';
diff --git a/yarn.lock b/yarn.lock
@@ -4068,9 +4068,9 @@ des.js@^1.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-"design-system@git://github.com/Wikia/design-system.git#IW-1261":
-  version "18.1.1"
-  resolved "git://github.com/Wikia/design-system.git#a31537dee9b72d212f0be62459d8a8c0afd631ec"
+"design-system@git://github.com/Wikia/design-system.git#IW-1589":
+  version "19.1.0"
+  resolved "git://github.com/Wikia/design-system.git#01bce53dc6a7c91b6f9fe94d921e5fdf5f569d73"
   dependencies:
     ember-autoresize "1.3.2"
     ember-cli-babel "7.2.0"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-common</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:400,700"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.29ce3c8d.js"></script></body></html>`
	`1`	`+<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-common</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:400,700"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.0cd9f7dd.js"></script></body></html>`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +```js
 +<IconError height="30" />
 +```