diff --git a/packages/icons/package.json b/packages/icons/package.json
index 4bee4ba6..947f7433 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
{
"name": "joyent-icons",
- "version": "3.0.0",
+ "version": "4.0.0",
"license": "MPL-2.0",
"repository": "github:yldio/joyent-portal",
"main": "dist/umd/index.js",
diff --git a/packages/icons/src/__tests__/__snapshots__/icons.spec.js.snap b/packages/icons/src/__tests__/__snapshots__/icons.spec.js.snap
index 64bed9f8..d873c545 100644
--- a/packages/icons/src/__tests__/__snapshots__/icons.spec.js.snap
+++ b/packages/icons/src/__tests__/__snapshots__/icons.spec.js.snap
@@ -14,29 +14,8 @@ Array [
xmlns="http://www.w3.org/2000/svg"
>
-
-
,
,
,
,
,
,
,
]
@@ -267,235 +120,109 @@ Array [
exports[`renders without throwing 1`] = `
Array [
,
,
,
,
,
,
,
]
`;
@@ -509,14 +236,13 @@ Array [
"transform": "rotate(0deg)",
}
}
- viewBox="0 0 9 6"
- width="9"
+ viewBox="0 0 9.6 6"
+ width="9.6"
xmlns="http://www.w3.org/2000/svg"
>
,
,
,
,
,
,
,
]
@@ -905,256 +625,116 @@ Array [
exports[`renders without throwing 1`] = `
Array [
,
,
,
,
,
,
,
]
`;
@@ -1162,122 +742,115 @@ Array [
exports[`renders without throwing 1`] = `
Array [
,
,
,
,
,
,
,
]
@@ -1286,368 +859,179 @@ Array [
exports[`renders without throwing 1`] = `
Array [
,
,
,
,
,
,
,
]
`;
@@ -1780,11 +1164,6 @@ exports[`renders without throwing 1`] = `
Array [
,
@@ -2540,7 +1735,7 @@ Array [
@@ -2548,7 +1743,7 @@ Array [
,
@@ -2558,256 +1753,81 @@ Array [
exports[`renders without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -2815,17 +1835,10 @@ Array [
exports[`renders without throwing 1`] = `
Array [
,
,
,
,
,
,
without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -3288,11 +2035,6 @@ exports[`renders without throwing 1`] = `
Array [
,
,
,
,
,
,
without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -4039,468 +2422,116 @@ Array [
exports[`renders without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -4528,28 +2559,28 @@ Array [
@@ -4557,7 +2588,7 @@ Array [
@@ -4566,7 +2597,7 @@ Array [
@@ -4575,7 +2606,7 @@ Array [
@@ -4584,7 +2615,7 @@ Array [
@@ -4593,7 +2624,7 @@ Array [
@@ -4602,11 +2633,11 @@ Array [
,
@@ -4631,28 +2662,28 @@ Array [
@@ -4660,7 +2691,7 @@ Array [
@@ -4669,7 +2700,7 @@ Array [
@@ -4678,7 +2709,7 @@ Array [
@@ -4687,7 +2718,7 @@ Array [
@@ -4696,7 +2727,7 @@ Array [
@@ -4705,11 +2736,11 @@ Array [
,
@@ -4734,28 +2765,28 @@ Array [
@@ -4763,7 +2794,7 @@ Array [
@@ -4772,7 +2803,7 @@ Array [
@@ -4781,7 +2812,7 @@ Array [
@@ -4790,7 +2821,7 @@ Array [
@@ -4799,7 +2830,7 @@ Array [
@@ -4808,11 +2839,11 @@ Array [
,
@@ -4837,28 +2868,28 @@ Array [
@@ -4866,7 +2897,7 @@ Array [
@@ -4875,7 +2906,7 @@ Array [
@@ -4884,7 +2915,7 @@ Array [
@@ -4893,7 +2924,7 @@ Array [
@@ -4902,7 +2933,7 @@ Array [
@@ -4911,11 +2942,11 @@ Array [
,
@@ -4940,28 +2971,28 @@ Array [
@@ -4969,7 +3000,7 @@ Array [
@@ -4978,7 +3009,7 @@ Array [
@@ -4987,7 +3018,7 @@ Array [
@@ -4996,7 +3027,7 @@ Array [
@@ -5005,7 +3036,7 @@ Array [
@@ -5014,11 +3045,11 @@ Array [
,
@@ -5043,28 +3074,28 @@ Array [
@@ -5072,7 +3103,7 @@ Array [
@@ -5081,7 +3112,7 @@ Array [
@@ -5090,7 +3121,7 @@ Array [
@@ -5099,7 +3130,7 @@ Array [
@@ -5108,7 +3139,7 @@ Array [
@@ -5117,11 +3148,11 @@ Array [
,
@@ -5146,28 +3177,28 @@ Array [
@@ -5175,7 +3206,7 @@ Array [
@@ -5184,7 +3215,7 @@ Array [
@@ -5193,7 +3224,7 @@ Array [
@@ -5202,7 +3233,7 @@ Array [
@@ -5211,7 +3242,7 @@ Array [
@@ -5220,11 +3251,11 @@ Array [
,
@@ -5234,536 +3265,116 @@ Array [
exports[`renders without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -5908,25 +3519,25 @@ Array [
>
,
@@ -5944,25 +3555,25 @@ Array [
>
,
@@ -5980,25 +3591,25 @@ Array [
>
,
@@ -6016,25 +3627,25 @@ Array [
>
,
@@ -6052,25 +3663,25 @@ Array [
>
,
@@ -6088,25 +3699,25 @@ Array [
>
,
@@ -6124,25 +3735,25 @@ Array [
>
,
@@ -6152,312 +3763,116 @@ Array [
exports[`renders without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -6466,11 +3881,6 @@ exports[`renders without throwing 1`] = `
Array [
,
,
,
,
,
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
,
]
`;
@@ -7124,128 +4252,114 @@ Array [
exports[`renders without throwing 1`] = `
Array [
,
,
,
,
,
,
,
@@ -7255,221 +4369,116 @@ Array [
exports[`renders without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -7477,221 +4486,116 @@ Array [
exports[`renders without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -7949,12 +4853,10 @@ Array [
viewBox="0 0 12 16"
width="12"
>
-
-
-
+
,
-
-
-
+
,
-
-
-
+
,
-
-
-
+
,
-
-
-
+
,
-
-
-
+
,
-
-
-
+
,
]
`;
@@ -8064,7 +4954,7 @@ Array [
exports[`renders without throwing 1`] = `
Array [
@@ -8082,7 +4972,7 @@ Array [
/>
,
@@ -8100,7 +4990,7 @@ Array [
/>
,
@@ -8118,7 +5008,7 @@ Array [
/>
,
@@ -8136,7 +5026,7 @@ Array [
/>
,
@@ -8154,7 +5044,7 @@ Array [
/>
,
@@ -8172,7 +5062,7 @@ Array [
/>
,
@@ -8214,7 +5104,7 @@ Array [
@@ -8222,7 +5112,7 @@ Array [
,
@@ -8246,7 +5136,7 @@ Array [
@@ -8254,7 +5144,7 @@ Array [
,
@@ -8278,7 +5168,7 @@ Array [
@@ -8286,7 +5176,7 @@ Array [
,
@@ -8310,7 +5200,7 @@ Array [
@@ -8318,7 +5208,7 @@ Array [
,
@@ -8342,7 +5232,7 @@ Array [
@@ -8350,7 +5240,7 @@ Array [
,
@@ -8374,7 +5264,7 @@ Array [
@@ -8382,7 +5272,7 @@ Array [
,
@@ -8406,7 +5296,7 @@ Array [
@@ -8414,7 +5304,7 @@ Array [
,
@@ -8424,288 +5314,115 @@ Array [
exports[`renders without throwing 1`] = `
Array [
,
,
,
,
,
,
,
]
@@ -8714,368 +5431,116 @@ Array [
exports[`renders without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -9089,46 +5554,14 @@ Array [
"transform": "rotate(0deg)",
}
}
- version="1.1"
viewBox="0 0 14 14"
width="14"
xmlns="http://www.w3.org/2000/svg"
- xmlnsXlink="http://www.w3.org/1999/xlink"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -9424,13 +5665,13 @@ Array [
exports[`renders without throwing 1`] = `
Array [
@@ -9440,13 +5681,13 @@ Array [
/>
,
@@ -9456,13 +5697,13 @@ Array [
/>
,
@@ -9472,13 +5713,13 @@ Array [
/>
,
@@ -9488,13 +5729,13 @@ Array [
/>
,
@@ -9504,13 +5745,13 @@ Array [
/>
,
@@ -9520,13 +5761,13 @@ Array [
/>
,
@@ -9541,326 +5782,116 @@ Array [
exports[`renders without throwing 1`] = `
Array [
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
,
]
`;
@@ -10007,14 +6038,14 @@ Array [
@@ -10022,12 +6053,12 @@ Array [
,
@@ -10052,14 +6083,14 @@ Array [
@@ -10067,12 +6098,12 @@ Array [
,
@@ -10097,14 +6128,14 @@ Array [
@@ -10112,12 +6143,12 @@ Array [
,
@@ -10142,14 +6173,14 @@ Array [
@@ -10157,12 +6188,12 @@ Array [
,
@@ -10187,14 +6218,14 @@ Array [
@@ -10202,12 +6233,12 @@ Array [
,
@@ -10232,14 +6263,14 @@ Array [
@@ -10247,12 +6278,12 @@ Array [
,
@@ -10277,14 +6308,14 @@ Array [
@@ -10292,12 +6323,12 @@ Array [
,
diff --git a/packages/icons/src/__tests__/icons.spec.js b/packages/icons/src/__tests__/icons.spec.js
index 228150d2..99433c10 100644
--- a/packages/icons/src/__tests__/icons.spec.js
+++ b/packages/icons/src/__tests__/icons.spec.js
@@ -1,5 +1,4 @@
import React, { Fragment } from 'react';
-import { ThemeProvider } from 'styled-components';
import renderer from 'react-test-renderer';
import 'jest-styled-components';
diff --git a/packages/icons/src/actions.js b/packages/icons/src/actions.js
index f4018112..650bdb94 100644
--- a/packages/icons/src/actions.js
+++ b/packages/icons/src/actions.js
@@ -1,5 +1,4 @@
import React from 'react';
-import remcalc from 'remcalc';
import Rotate from './rotate';
import calcFill from './fill';
@@ -16,29 +15,16 @@ export default ({
{({ style: rotateStyle }) => (
-
-
)}
diff --git a/packages/icons/src/affinity.js b/packages/icons/src/affinity.js
index 9941eb05..8bf62226 100644
--- a/packages/icons/src/affinity.js
+++ b/packages/icons/src/affinity.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -17,34 +14,12 @@ export default ({
}) => (
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
+
+
)}
-);
+);
\ No newline at end of file
diff --git a/packages/icons/src/arrow.js b/packages/icons/src/arrow.js
index fbf1cbb8..b5025e48 100644
--- a/packages/icons/src/arrow.js
+++ b/packages/icons/src/arrow.js
@@ -15,17 +15,16 @@ export default ({
{({ style: rotateStyle }) => (
)}
diff --git a/packages/icons/src/clipboard.js b/packages/icons/src/clipboard.js
index f0424d15..0661ee30 100644
--- a/packages/icons/src/clipboard.js
+++ b/packages/icons/src/clipboard.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,32 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/close.js b/packages/icons/src/close.js
index 2ba9708e..f3466ae9 100644
--- a/packages/icons/src/close.js
+++ b/packages/icons/src/close.js
@@ -15,17 +15,16 @@ export default ({
{({ style: rotateStyle }) => (
)}
diff --git a/packages/icons/src/cns.js b/packages/icons/src/cns.js
index 36892088..9bbcc628 100644
--- a/packages/icons/src/cns.js
+++ b/packages/icons/src/cns.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,51 +15,20 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
)}
diff --git a/packages/icons/src/cpu.js b/packages/icons/src/cpu.js
index 6b4a3d48..85b0267b 100644
--- a/packages/icons/src/cpu.js
+++ b/packages/icons/src/cpu.js
@@ -15,12 +15,10 @@ export default ({
{({ style: rotateStyle }) => (
{({ style: rotateStyle }) => (
)}
diff --git a/packages/icons/src/delete.js b/packages/icons/src/delete.js
index 235dcaca..e91e42f8 100644
--- a/packages/icons/src/delete.js
+++ b/packages/icons/src/delete.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,31 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/edit.js b/packages/icons/src/edit.js
index 89e2dad9..5c38cbd1 100644
--- a/packages/icons/src/edit.js
+++ b/packages/icons/src/edit.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,35 +15,15 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/fabric.js b/packages/icons/src/fabric.js
index ed994828..7397edb6 100644
--- a/packages/icons/src/fabric.js
+++ b/packages/icons/src/fabric.js
@@ -15,18 +15,14 @@ export default ({
{({ style: rotateStyle }) => (
)}
diff --git a/packages/icons/src/filter.js b/packages/icons/src/filter.js
new file mode 100644
index 00000000..f417ae49
--- /dev/null
+++ b/packages/icons/src/filter.js
@@ -0,0 +1,32 @@
+import React from 'react';
+
+import Rotate from './rotate';
+import calcFill from './fill';
+
+export default ({
+ fill = null,
+ light = false,
+ disabled = false,
+ direction = 'down',
+ colors = {},
+ style = {},
+ ...rest
+}) => (
+
+ {({ style: rotateStyle }) => (
+
+
+
+ )}
+
+);
diff --git a/packages/icons/src/firewall.js b/packages/icons/src/firewall.js
index 03ea5658..16550b42 100644
--- a/packages/icons/src/firewall.js
+++ b/packages/icons/src/firewall.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,47 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/general.js b/packages/icons/src/general.js
index 80a84435..b00c3b61 100644
--- a/packages/icons/src/general.js
+++ b/packages/icons/src/general.js
@@ -15,12 +15,10 @@ export default ({
{({ style: rotateStyle }) => (
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/import.js b/packages/icons/src/import.js
index afd2ade4..d6318092 100644
--- a/packages/icons/src/import.js
+++ b/packages/icons/src/import.js
@@ -1,58 +1,31 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
+import calcFill from './fill';
-const ids = [rndId(), rndId(), rndId()];
-
-export default ({ direction = 'down', style = {}, colors = {}, ...rest }) => (
+export default ({
+ fill = null,
+ light = false,
+ disabled = false,
+ direction = 'down',
+ colors = {},
+ style = {},
+ ...rest
+}) => (
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js
index 5c9035b4..b75ef7a5 100644
--- a/packages/icons/src/index.js
+++ b/packages/icons/src/index.js
@@ -14,6 +14,7 @@ export { default as Dot } from './dot';
export { default as Duplicate } from './duplicate';
export { default as Edit } from './edit';
export { default as Fabric } from './fabric';
+// export { default as Filter } from './filter';
export { default as Firewall } from './firewall';
export { default as General } from './general';
export { default as Health } from './health';
@@ -36,6 +37,7 @@ export { default as Public } from './public';
export { default as Randomize } from './randomize';
export { default as Reset } from './reset';
export { default as Restart } from './restart';
+export { default as Script } from './script';
export { default as Services } from './services';
export { default as Start } from './start';
export { default as Stop } from './stop';
diff --git a/packages/icons/src/instance-type.js b/packages/icons/src/instance-type.js
index 9529819b..4a65f9a7 100644
--- a/packages/icons/src/instance-type.js
+++ b/packages/icons/src/instance-type.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,75 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/login.js b/packages/icons/src/login.js
index 7c84f373..4367343c 100644
--- a/packages/icons/src/login.js
+++ b/packages/icons/src/login.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,43 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/memory.js b/packages/icons/src/memory.js
index 6d99a34d..b3327c92 100644
--- a/packages/icons/src/memory.js
+++ b/packages/icons/src/memory.js
@@ -15,12 +15,10 @@ export default ({
{({ style: rotateStyle }) => (
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
)}
diff --git a/packages/icons/src/name.js b/packages/icons/src/name.js
index 61a19485..938c3cf0 100644
--- a/packages/icons/src/name.js
+++ b/packages/icons/src/name.js
@@ -15,18 +15,16 @@ export default ({
{({ style: rotateStyle }) => (
)}
diff --git a/packages/icons/src/network.js b/packages/icons/src/network.js
index 09d5640d..c009d6e1 100644
--- a/packages/icons/src/network.js
+++ b/packages/icons/src/network.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,30 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/package.js b/packages/icons/src/package.js
index cad4459b..d84d8bf0 100644
--- a/packages/icons/src/package.js
+++ b/packages/icons/src/package.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,30 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/private.js b/packages/icons/src/private.js
index 3f5d04f3..812e6029 100644
--- a/packages/icons/src/private.js
+++ b/packages/icons/src/private.js
@@ -16,9 +16,9 @@ export default ({
{({ style: rotateStyle }) => (
diff --git a/packages/icons/src/public.js b/packages/icons/src/public.js
index 0b5bd1a8..3cb2119b 100644
--- a/packages/icons/src/public.js
+++ b/packages/icons/src/public.js
@@ -21,12 +21,10 @@ export default ({
style={{ ...style, ...rotateStyle }}
{...rest}
>
-
-
-
+
)}
diff --git a/packages/icons/src/randomize.js b/packages/icons/src/randomize.js
index 8b2d0d87..3e8d41e6 100644
--- a/packages/icons/src/randomize.js
+++ b/packages/icons/src/randomize.js
@@ -19,8 +19,8 @@ export default ({
version="1.1"
xmlns="http://www.w3.org/2000/svg"
xmlnsXlink="http://www.w3.org/1999/xlink"
- width="17"
- height="17"
+ width="18.22"
+ height="18.22"
style={{ ...style, ...rotateStyle }}
{...rest}
>
diff --git a/packages/icons/src/restart.js b/packages/icons/src/restart.js
index fb965aef..0b513537 100644
--- a/packages/icons/src/restart.js
+++ b/packages/icons/src/restart.js
@@ -1,23 +1,32 @@
import React from 'react';
-export default props => (
-
-
-
+import Rotate from './rotate';
+import calcFill from './fill';
+
+export default ({
+ fill = null,
+ light = false,
+ disabled = false,
+ direction = 'down',
+ colors = {},
+ style = {},
+ ...rest
+}) => (
+
+ {({ style: rotateStyle }) => (
+
+
+
+ )}
+
);
diff --git a/packages/icons/src/script.js b/packages/icons/src/script.js
new file mode 100644
index 00000000..25079db2
--- /dev/null
+++ b/packages/icons/src/script.js
@@ -0,0 +1,32 @@
+import React from 'react';
+
+import Rotate from './rotate';
+import calcFill from './fill';
+
+export default ({
+ fill = null,
+ light = false,
+ disabled = false,
+ direction = 'down',
+ colors = {},
+ style = {},
+ ...rest
+}) => (
+
+ {({ style: rotateStyle }) => (
+
+
+
+ )}
+
+);
diff --git a/packages/icons/src/services.js b/packages/icons/src/services.js
index 5df25a62..255a9667 100644
--- a/packages/icons/src/services.js
+++ b/packages/icons/src/services.js
@@ -21,13 +21,10 @@ export default ({
style={{ ...style, ...rotateStyle }}
{...rest}
>
-
-
-
+
)}
diff --git a/packages/icons/src/start.js b/packages/icons/src/start.js
index 569496e6..759764c0 100644
--- a/packages/icons/src/start.js
+++ b/packages/icons/src/start.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,47 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/stop.js b/packages/icons/src/stop.js
index fb7e5ca7..d3ec8d9c 100644
--- a/packages/icons/src/stop.js
+++ b/packages/icons/src/stop.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,43 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/icons/src/storage.js b/packages/icons/src/storage.js
index 3b136625..2c6d6f8a 100644
--- a/packages/icons/src/storage.js
+++ b/packages/icons/src/storage.js
@@ -15,10 +15,10 @@ export default ({
{({ style: rotateStyle }) => (
diff --git a/packages/icons/src/tags.js b/packages/icons/src/tags.js
index 519d4cf5..9c89507f 100644
--- a/packages/icons/src/tags.js
+++ b/packages/icons/src/tags.js
@@ -1,11 +1,8 @@
import React from 'react';
-import rndId from 'rnd-id';
import Rotate from './rotate';
import calcFill from './fill';
-const ids = [rndId(), rndId(), rndId()];
-
export default ({
fill = null,
light = false,
@@ -18,45 +15,17 @@ export default ({
{({ style: rotateStyle }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
)}
diff --git a/packages/my-joy-beta/package.json b/packages/my-joy-beta/package.json
index 27822d17..de5c944d 100644
--- a/packages/my-joy-beta/package.json
+++ b/packages/my-joy-beta/package.json
@@ -24,7 +24,8 @@
"constant-case": "^2.0.0",
"date-fns": "^1.29.0",
"declarative-redux-form": "^2.0.8",
- "joyent-ui-toolkit": "^4.4.1",
+ "joyent-manifest-editor": "1.4.0",
+ "joyent-ui-toolkit": "^4.5.0",
"lodash.find": "^4.6.0",
"lodash.get": "^4.4.2",
"lodash.isstring": "^4.0.1",
diff --git a/packages/my-joy-beta/public/index.html b/packages/my-joy-beta/public/index.html
index f9fa69eb..af16ed0c 100644
--- a/packages/my-joy-beta/public/index.html
+++ b/packages/my-joy-beta/public/index.html
@@ -15,6 +15,5 @@
-