diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png index 20a93c68..89217cc4 100644 Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-fabric-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-fabric-1-snap.png index f0a23cfc..6965264e 100644 Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-fabric-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-fabric-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-fabric-2-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-fabric-2-snap.png index 6965264e..d6efbae0 100644 Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-fabric-2-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-fabric-2-snap.png differ diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png index e57cb0fe..c3fbb7a6 100644 Binary files a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/name-ui-js-name-name-test-2-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/name-ui-js-name-name-test-2-snap.png new file mode 100644 index 00000000..5261c5e6 Binary files /dev/null and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/name-ui-js-name-name-test-2-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/list-ui-js-item-mutating-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/list-ui-js-item-mutating-1-snap.png index 17247739..4acdf977 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/list-ui-js-item-mutating-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/list-ui-js-item-mutating-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-actions-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-actions-1-snap.png index fac51a60..4af47c0d 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-actions-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-actions-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-1-snap.png index 71f44779..077638f8 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-item-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-item-1-snap.png index 52c4948b..117cb159 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-item-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-item-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png index 55d52b09..3bc7c0d2 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-1-snap.png index 2251a53d..2233378d 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-all-selected-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-all-selected-1-snap.png index d65141cd..bffff7f0 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-all-selected-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-all-selected-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-1-snap.png index ff590c82..ea752311 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-sort-order-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-sort-order-1-snap.png index b78b8a2d..7fb0746c 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-sort-order-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-sort-order-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-submitting-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-submitting-1-snap.png index a8a59b2f..8b6f85aa 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-submitting-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-submitting-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png index 1e462d44..2adf7ff4 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/snapshots.spec.js.snap b/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/snapshots.spec.js.snap index 0d48e559..9abb43ba 100644 --- a/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/snapshots.spec.js.snap +++ b/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/snapshots.spec.js.snap @@ -467,17 +467,6 @@ Array [ Created - - - Updated - - without throwing 1`] = ` > almost NaN years - - almost NaN years - without throwing 1`] = ` > 3 months - - 3 months - without throwing 1`] = ` > without throwing 1`] = `

- Loading... + Starting... +

+ + + + + +
+ + + + + +

+ Removing...

@@ -2258,17 +2281,6 @@ Array [ Created - - - Updated - - - - - Updated - - - - - Updated - - - - - Updated - - - - - Updated - - without throwing', () => { - + +
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/snapshots.ui.js b/packages/my-joy-beta/src/components/instances/__tests__/snapshots.ui.js index 3c70226b..2cf99ee5 100644 --- a/packages/my-joy-beta/src/components/instances/__tests__/snapshots.ui.js +++ b/packages/my-joy-beta/src/components/instances/__tests__/snapshots.ui.js @@ -26,7 +26,8 @@ it('', async () => { - + +
diff --git a/packages/my-joy-beta/src/components/instances/snapshots.js b/packages/my-joy-beta/src/components/instances/snapshots.js index 239e24c4..34d34bdb 100644 --- a/packages/my-joy-beta/src/components/instances/snapshots.js +++ b/packages/my-joy-beta/src/components/instances/snapshots.js @@ -30,6 +30,11 @@ const stateColor = { CREATED: 'green' }; +const loadingState = { + start: 'Starting...', + remove: 'Removing...' +}; + export const Item = ({ name, state, @@ -73,8 +78,8 @@ export const Item = ({ ) : ( - - + + )} diff --git a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png index 525f9e43..87e24409 100644 Binary files a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png and b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png index 34cf9f87..ed51cafe 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png index b8185b68..fc9bdfe1 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png index 0d2f5535..dd3992ee 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png index dc7784b3..23b8fd44 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png index 5099d9fc..aa74dd85 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png index 023e6b2f..18f02c89 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png index 217b0c57..a141971c 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png index a141971c..4721af67 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png index 8ed38d6c..bd9100d3 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png index 4721af67..eeb6b99f 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png index b199fe57..1a98c03f 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/navigation/__tests__/__image_snapshots__/breadcrumb-ui-js-breadcrumb-1-snap.png b/packages/my-joy-beta/src/containers/navigation/__tests__/__image_snapshots__/breadcrumb-ui-js-breadcrumb-1-snap.png index 8381ad3c..68f5455e 100644 Binary files a/packages/my-joy-beta/src/containers/navigation/__tests__/__image_snapshots__/breadcrumb-ui-js-breadcrumb-1-snap.png and b/packages/my-joy-beta/src/containers/navigation/__tests__/__image_snapshots__/breadcrumb-ui-js-breadcrumb-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/navigation/__tests__/__image_snapshots__/breadcrumb-ui-js-breadcrumb-match-1-snap.png b/packages/my-joy-beta/src/containers/navigation/__tests__/__image_snapshots__/breadcrumb-ui-js-breadcrumb-match-1-snap.png index 76a68fea..3b2ea778 100644 Binary files a/packages/my-joy-beta/src/containers/navigation/__tests__/__image_snapshots__/breadcrumb-ui-js-breadcrumb-match-1-snap.png and b/packages/my-joy-beta/src/containers/navigation/__tests__/__image_snapshots__/breadcrumb-ui-js-breadcrumb-match-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/navigation/__tests__/__snapshots__/breadcrumb.spec.js.snap b/packages/my-joy-beta/src/containers/navigation/__tests__/__snapshots__/breadcrumb.spec.js.snap index 9d82369b..592a7be8 100644 --- a/packages/my-joy-beta/src/containers/navigation/__tests__/__snapshots__/breadcrumb.spec.js.snap +++ b/packages/my-joy-beta/src/containers/navigation/__tests__/__snapshots__/breadcrumb.spec.js.snap @@ -1,7 +1,18 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`renders without throwing 1`] = ` -.c0 { +.c1 { + margin-right: auto; + margin-left: auto; + padding-right: 1.875rem; + padding-left: 1.875rem; + box-sizing: border-box; + width: 100%; + padding-left: 0; + padding-right: 0; +} + +.c3 { margin-right: auto; margin-left: auto; box-sizing: border-box; @@ -9,7 +20,7 @@ exports[`renders without throwing 1`] = ` max-width: 62.5rem; } -.c2 { +.c4 { box-sizing: border-box; display: -webkit-box; display: -webkit-flex; @@ -28,7 +39,7 @@ exports[`renders without throwing 1`] = ` margin-left: -0.625rem; } -.c3 { +.c5 { box-sizing: border-box; -webkit-flex: 0 0 auto; -ms-flex: 0 0 auto; @@ -38,7 +49,7 @@ exports[`renders without throwing 1`] = ` display: block; } -.c5 { +.c7 { color: rgba(73,73,73,1); font-weight: 600; line-height: 1.5rem; @@ -48,28 +59,29 @@ exports[`renders without throwing 1`] = ` margin: 0.75rem 0; } -.c5 + p, -.c5 + small, -.c5 + h1, -.c5 + h2, -.c5 + label, -.c5 + h3, -.c5 + h4, -.c5 + h5, -.c5 + div, -.c5 + span { +.c7 + p, +.c7 + small, +.c7 + h1, +.c7 + h2, +.c7 + label, +.c7 + h3, +.c7 + h4, +.c7 + h5, +.c7 + div, +.c7 + span { margin-top: 0.75rem; } -.c1 { - margin-top: 1.5rem; +.c2 { + padding-top: 0.75rem; + padding-bottom: 0.75rem; } -.c6 { +.c8 { margin: 0.1875rem 0.625rem; } -.c4 { +.c6 { display: -webkit-inline-box; display: -webkit-inline-flex; display: -ms-inline-flexbox; @@ -80,43 +92,47 @@ exports[`renders without throwing 1`] = ` align-items: center; } -.c4:first-child a { +.c6:first-child a { color: inherit; -webkit-text-decoration: none; text-decoration: none; } -.c4:last-child svg { +.c6:last-child svg { display: none; } +.c0 { + border-bottom: 1px solid rgb(216,216,216); +} + @media only screen and (min-width:48em) { - .c0 { + .c3 { width: 46rem; } } @media only screen and (min-width:64em) { - .c0 { + .c3 { width: 56rem; } } @media only screen and (min-width:75em) { - .c0 { + .c3 { width: 59rem; } } @media only screen and (max-width:47.9375rem) { - .c0 { + .c3 { padding-left: 0.375rem; padding-right: 0.375rem; } } @media only screen and (min-width:0em) { - .c3 { + .c5 { -webkit-flex-basis: 100%; -ms-flex-preferred-size: 100%; flex-basis: 100%; @@ -125,45 +141,49 @@ exports[`renders without throwing 1`] = ` }
-

- Instances -

- + Instances + + - - + viewBox="0 0 9.6 6" + width="9.6" + xmlns="http://www.w3.org/2000/svg" + > + + +
@@ -172,7 +192,18 @@ exports[`renders without throwing 1`] = ` `; exports[`renders without throwing 1`] = ` -.c0 { +.c1 { + margin-right: auto; + margin-left: auto; + padding-right: 1.875rem; + padding-left: 1.875rem; + box-sizing: border-box; + width: 100%; + padding-left: 0; + padding-right: 0; +} + +.c3 { margin-right: auto; margin-left: auto; box-sizing: border-box; @@ -180,7 +211,7 @@ exports[`renders without throwing 1`] = ` max-width: 62.5rem; } -.c2 { +.c4 { box-sizing: border-box; display: -webkit-box; display: -webkit-flex; @@ -199,7 +230,7 @@ exports[`renders without throwing 1`] = ` margin-left: -0.625rem; } -.c3 { +.c5 { box-sizing: border-box; -webkit-flex: 0 0 auto; -ms-flex: 0 0 auto; @@ -209,7 +240,7 @@ exports[`renders without throwing 1`] = ` display: block; } -.c5 { +.c7 { color: rgba(73,73,73,1); font-weight: 600; line-height: 1.5rem; @@ -219,28 +250,29 @@ exports[`renders without throwing 1`] = ` margin: 0.75rem 0; } -.c5 + p, -.c5 + small, -.c5 + h1, -.c5 + h2, -.c5 + label, -.c5 + h3, -.c5 + h4, -.c5 + h5, -.c5 + div, -.c5 + span { +.c7 + p, +.c7 + small, +.c7 + h1, +.c7 + h2, +.c7 + label, +.c7 + h3, +.c7 + h4, +.c7 + h5, +.c7 + div, +.c7 + span { margin-top: 0.75rem; } -.c1 { - margin-top: 1.5rem; +.c2 { + padding-top: 0.75rem; + padding-bottom: 0.75rem; } -.c6 { +.c8 { margin: 0.1875rem 0.625rem; } -.c4 { +.c6 { display: -webkit-inline-box; display: -webkit-inline-flex; display: -ms-inline-flexbox; @@ -251,43 +283,47 @@ exports[`renders without throwing 1`] = ` align-items: center; } -.c4:first-child a { +.c6:first-child a { color: inherit; -webkit-text-decoration: none; text-decoration: none; } -.c4:last-child svg { +.c6:last-child svg { display: none; } +.c0 { + border-bottom: 1px solid rgb(216,216,216); +} + @media only screen and (min-width:48em) { - .c0 { + .c3 { width: 46rem; } } @media only screen and (min-width:64em) { - .c0 { + .c3 { width: 56rem; } } @media only screen and (min-width:75em) { - .c0 { + .c3 { width: 59rem; } } @media only screen and (max-width:47.9375rem) { - .c0 { + .c3 { padding-left: 0.375rem; padding-right: 0.375rem; } } @media only screen and (min-width:0em) { - .c3 { + .c5 { -webkit-flex-basis: 100%; -ms-flex-preferred-size: 100%; flex-basis: 100%; @@ -296,73 +332,77 @@ exports[`renders without throwing 1`] = ` }
-

- Instances -

- + Instances + + + + +
+
- - -
-
-

- name -

- + name + + - - + viewBox="0 0 9.6 6" + width="9.6" + xmlns="http://www.w3.org/2000/svg" + > + + +
diff --git a/packages/ui-toolkit/src/breadcrumb/__tests__/__snapshots__/index.spec.js.snap b/packages/ui-toolkit/src/breadcrumb/__tests__/__snapshots__/index.spec.js.snap index 2ccef1a2..0b684b7b 100644 --- a/packages/ui-toolkit/src/breadcrumb/__tests__/__snapshots__/index.spec.js.snap +++ b/packages/ui-toolkit/src/breadcrumb/__tests__/__snapshots__/index.spec.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Breadcrumb Default Breadcrumb 1`] = ` -.c5 { +.c7 { color: rgba(73,73,73,1); font-weight: 600; line-height: 1.5rem; @@ -11,24 +11,24 @@ exports[`Breadcrumb Default Breadcrumb 1`] = ` margin: 0.75rem 0; } -.c5 + p, -.c5 + small, -.c5 + h1, -.c5 + h2, -.c5 + label, -.c5 + h3, -.c5 + h4, -.c5 + h5, -.c5 + div, -.c5 + span { +.c7 + p, +.c7 + small, +.c7 + h1, +.c7 + h2, +.c7 + label, +.c7 + h3, +.c7 + h4, +.c7 + h5, +.c7 + div, +.c7 + span { margin-top: 0.75rem; } -.c6 { +.c8 { margin: 0.1875rem 0.625rem; } -.c4 { +.c6 { display: -webkit-inline-box; display: -webkit-inline-flex; display: -ms-inline-flexbox; @@ -39,17 +39,28 @@ exports[`Breadcrumb Default Breadcrumb 1`] = ` align-items: center; } -.c4:first-child a { +.c6:first-child a { color: inherit; -webkit-text-decoration: none; text-decoration: none; } -.c4:last-child svg { +.c6:last-child svg { display: none; } -.c0 { +.c1 { + margin-right: auto; + margin-left: auto; + padding-right: 1.875rem; + padding-left: 1.875rem; + box-sizing: border-box; + width: 100%; + padding-left: 0; + padding-right: 0; +} + +.c3 { margin-right: auto; margin-left: auto; box-sizing: border-box; @@ -57,7 +68,7 @@ exports[`Breadcrumb Default Breadcrumb 1`] = ` max-width: 62.5rem; } -.c2 { +.c4 { box-sizing: border-box; display: -webkit-box; display: -webkit-flex; @@ -76,7 +87,7 @@ exports[`Breadcrumb Default Breadcrumb 1`] = ` margin-left: -0.625rem; } -.c3 { +.c5 { box-sizing: border-box; -webkit-flex: 0 0 auto; -ms-flex: 0 0 auto; @@ -86,37 +97,42 @@ exports[`Breadcrumb Default Breadcrumb 1`] = ` display: block; } -.c1 { - margin-top: 1.5rem; +.c2 { + padding-top: 0.75rem; + padding-bottom: 0.75rem; +} + +.c0 { + border-bottom: 1px solid rgb(216,216,216); } @media only screen and (min-width:48em) { - .c0 { + .c3 { width: 46rem; } } @media only screen and (min-width:64em) { - .c0 { + .c3 { width: 56rem; } } @media only screen and (min-width:75em) { - .c0 { + .c3 { width: 59rem; } } @media only screen and (max-width:47.9375rem) { - .c0 { + .c3 { padding-left: 0.375rem; padding-right: 0.375rem; } } @media only screen and (min-width:0em) { - .c3 { + .c5 { -webkit-flex-basis: 100%; -ms-flex-preferred-size: 100%; flex-basis: 100%; @@ -125,129 +141,133 @@ exports[`Breadcrumb Default Breadcrumb 1`] = ` }
-

- Home -

- + Home + + + + +
+
- - -
-
-

- Warp Records Blog -

- + Warp Records Blog + + + + +
+
- - -
-
-

- Services -

- + Services + + + + +
+
- - -
-
-

- Nginx -

- + Nginx + + - - + viewBox="0 0 9.6 6" + width="9.6" + xmlns="http://www.w3.org/2000/svg" + > + + +
diff --git a/packages/ui-toolkit/src/breadcrumb/index.js b/packages/ui-toolkit/src/breadcrumb/index.js index 73d5bbba..d0478a52 100644 --- a/packages/ui-toolkit/src/breadcrumb/index.js +++ b/packages/ui-toolkit/src/breadcrumb/index.js @@ -1,20 +1,27 @@ import React from 'react'; +import styled from 'styled-components'; import { Row, Col } from 'joyent-react-styled-flexboxgrid'; -import { Margin } from 'styled-components-spacing'; +import { Margin, Padding } from 'styled-components-spacing'; import Container from '../layout/view-container'; +const BreadcrumContianer = styled(Container)` + border-bottom: 1px solid ${props => props.theme.grey}; +`; + /** * @example ./usage.md */ export default ({ children, ...rest }) => ( - - - - {children} - - - + + + + + {children} + + + + ); export { default as Item } from './item'; diff --git a/yarn.lock b/yarn.lock index 53065859..943c286d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3937,15 +3937,15 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1 resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" escodegen@^1.6.1, escodegen@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852" + version "1.9.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2" dependencies: esprima "^3.1.3" estraverse "^4.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: - source-map "~0.5.6" + source-map "~0.6.1" escope@^3.6.0: version "3.6.0" @@ -10519,7 +10519,7 @@ source-map-url@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9" -source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.6: +source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"