Merge pull request #21 from Wikia/IW-1261

vforge · web-flow · commit 66c7ab5bfeb2 · 2019-02-10T20:21:15.000-08:00
IW-1261 | cross icon added temporarily as a duplicate of close icon
diff --git a/components/Avatar.css b/components/Avatar.css
@@ -62,14 +62,6 @@
 .wds-avatar img.wds-avatar__image:hover {
   border-color: #bed1cf;
 }
-.wds-avatar.is-default:before {
-  height: 42px;
-  min-width: 42px;
-  width: 42px;
-  border: solid 3px #fff;
-  left: 3px;
-  top: 3px;
-}
 .wds-avatar .wds-avatar__badge {
   height: 20.1872px;
   min-width: 20.1872px;
diff --git a/components/IconSprite.js b/components/IconSprite.js
diff --git a/docs/build/1.52d34b7a.js b/docs/build/1.52d34b7a.js
diff --git a/docs/build/bundle.ff9a0e9e.js b/docs/build/bundle.ff9a0e9e.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.02f52b1a.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.ff9a0e9e.js"></script></body></html>
diff --git a/icons/IconCross.js b/icons/IconCross.js
@@ -0,0 +1,32 @@
+'use strict';
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var React = _interopDefault(require('react'));
+
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+var IconCross = ((_ref) => {
+  let props = _objectWithoutProperties(_ref, ["styles"]);
+
+  return React.createElement(
+    "svg",
+    _extends({ xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink", viewBox: "0 0 24 24" }, props),
+    React.createElement(
+      "defs",
+      null,
+      React.createElement("path", { id: "id-icons/IconCross-a", d: "M22.083 23a.914.914 0 0 1-.648-.269l-9.485-9.485-9.385 9.385a.917.917 0 0 1-1.296-1.297l9.384-9.384L1.37 2.666a.917.917 0 0 1 1.297-1.297l9.284 9.283 9.384-9.383a.916.916 0 1 1 1.297 1.296l-9.385 9.385 9.485 9.485A.916.916 0 0 1 22.083 23" })
+    ),
+    React.createElement("use", { fillRule: "evenodd", xlinkHref: "#id-icons/IconCross-a" })
+  );
+});
+
+// This file is generated automatically via extract-assets-from-ds.js
+/** @component */
+
+var index = (function (props) {
+  return React.createElement(IconCross, props);
+});
+
+module.exports = index;
diff --git a/icons/IconCrossSmall.js b/icons/IconCrossSmall.js
@@ -0,0 +1,32 @@
+'use strict';
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var React = _interopDefault(require('react'));
+
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+var IconCrossSmall = ((_ref) => {
+  let props = _objectWithoutProperties(_ref, ["styles"]);
+
+  return React.createElement(
+    "svg",
+    _extends({ xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink", viewBox: "0 0 18 18" }, props),
+    React.createElement(
+      "defs",
+      null,
+      React.createElement("path", { id: "id-icons/IconCrossSmall-a", d: "M10.414 9l6.293-6.293a.999.999 0 1 0-1.414-1.414L9 7.586 2.707 1.293a.999.999 0 1 0-1.414 1.414L7.586 9l-6.293 6.293a.999.999 0 1 0 1.414 1.414L9 10.414l6.293 6.293a.997.997 0 0 0 1.414 0 .999.999 0 0 0 0-1.414L10.414 9z" })
+    ),
+    React.createElement("use", { fillRule: "evenodd", xlinkHref: "#id-icons/IconCrossSmall-a" })
+  );
+});
+
+// This file is generated automatically via extract-assets-from-ds.js
+/** @component */
+
+var index = (function (props) {
+  return React.createElement(IconCrossSmall, props);
+});
+
+module.exports = index;
diff --git a/icons/IconCrossTiny.js b/icons/IconCrossTiny.js
@@ -0,0 +1,32 @@
+'use strict';
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var React = _interopDefault(require('react'));
+
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+var IconCrossTiny = ((_ref) => {
+  let props = _objectWithoutProperties(_ref, ["styles"]);
+
+  return React.createElement(
+    "svg",
+    _extends({ xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink", viewBox: "0 0 12 12" }, props),
+    React.createElement(
+      "defs",
+      null,
+      React.createElement("path", { id: "id-icons/IconCrossTiny-a", d: "M7.426 6.001l4.278-4.279A1.008 1.008 0 1 0 10.278.296L6 4.574 1.723.296A1.008 1.008 0 1 0 .295 1.722l4.278 4.28-4.279 4.277a1.008 1.008 0 1 0 1.427 1.426L6 7.427l4.278 4.278a1.006 1.006 0 0 0 1.426 0 1.008 1.008 0 0 0 0-1.426L7.425 6.001z" })
+    ),
+    React.createElement("use", { fillRule: "evenodd", xlinkHref: "#id-icons/IconCrossTiny-a" })
+  );
+});
+
+// This file is generated automatically via extract-assets-from-ds.js
+/** @component */
+
+var index = (function (props) {
+  return React.createElement(IconCrossTiny, props);
+});
+
+module.exports = index;
diff --git a/source/icons/IconCross/README.md b/source/icons/IconCross/README.md
@@ -0,0 +1,4 @@
+
+```js
+<IconCross height="30" />
+```
diff --git a/source/icons/IconCross/index.js b/source/icons/IconCross/index.js
@@ -0,0 +1,6 @@
+// This file is generated automatically via extract-assets-from-ds.js
+import React from 'react';
+import IconCross from 'design-system/dist/svg/wds-icons-cross.svg';
+
+/** @component */
+export default props => <IconCross {...props} />;
diff --git a/source/icons/IconCrossSmall/README.md b/source/icons/IconCrossSmall/README.md
@@ -0,0 +1,4 @@
+
+```js
+<IconCrossSmall height="30" />
+```
diff --git a/source/icons/IconCrossSmall/index.js b/source/icons/IconCrossSmall/index.js
@@ -0,0 +1,6 @@
+// This file is generated automatically via extract-assets-from-ds.js
+import React from 'react';
+import IconCrossSmall from 'design-system/dist/svg/wds-icons-cross-small.svg';
+
+/** @component */
+export default props => <IconCrossSmall {...props} />;
diff --git a/source/icons/IconCrossTiny/README.md b/source/icons/IconCrossTiny/README.md
@@ -0,0 +1,4 @@
+
+```js
+<IconCrossTiny height="30" />
+```
diff --git a/source/icons/IconCrossTiny/index.js b/source/icons/IconCrossTiny/index.js
@@ -0,0 +1,6 @@
+// This file is generated automatically via extract-assets-from-ds.js
+import React from 'react';
+import IconCrossTiny from 'design-system/dist/svg/wds-icons-cross-tiny.svg';
+
+/** @component */
+export default props => <IconCrossTiny {...props} />;
diff --git a/source/icons/index.js b/source/icons/index.js
@@ -64,6 +64,9 @@ export { default as IconComment } from './IconComment';
 export { default as IconControlsSmall } from './IconControlsSmall';
 export { default as IconControlsTiny } from './IconControlsTiny';
 export { default as IconControls } from './IconControls';
+export { default as IconCrossSmall } from './IconCrossSmall';
+export { default as IconCrossTiny } from './IconCrossTiny';
+export { default as IconCross } from './IconCross';
 export { default as IconDashboardSmall } from './IconDashboardSmall';
 export { default as IconDashboardTiny } from './IconDashboardTiny';
 export { default as IconDashboard } from './IconDashboard';
diff --git a/source/yarn.lock b/source/yarn.lock
@@ -4069,8 +4069,8 @@ des.js@^1.0.0:
     minimalistic-assert "^1.0.0"
 
 "design-system@git://github.com/Wikia/design-system.git#IW-1261":
-  version "18.1.0"
-  resolved "git://github.com/Wikia/design-system.git#aef68ba9f08a5326cfc58aa569558470d14651cb"
+  version "18.1.1"
+  resolved "git://github.com/Wikia/design-system.git#a31537dee9b72d212f0be62459d8a8c0afd631ec"
   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.02f52b1a.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.ff9a0e9e.js"></script></body></html>`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +```js
 +<IconCross height="30" />
 +```