diff --git a/packages/images/src/components/footer.js b/packages/images/src/components/footer.js deleted file mode 100644 index 4ab37271..00000000 --- a/packages/images/src/components/footer.js +++ /dev/null @@ -1,54 +0,0 @@ -import React from 'react'; -import styled from 'styled-components'; -import remcalc from 'remcalc'; - -const List = styled.ul` - display: flex; - list-style: none; - padding: ${remcalc(12)} ${remcalc(18)}; - border-top: ${remcalc(1)} solid ${props => props.theme.grey}; - width: 100%; - justify-content: flex-end; - position: absolute; - box-sizing: border-box; - margin: 0; - bottom: 0; -`; - -const ListItem = styled.li` - color: ${props => props.theme.greyDark}; - &:not(:last-child) { - padding-right: ${remcalc(24)}; - } -`; - -const Link = styled.a` - color: ${props => props.theme.greyDark}; - text-decoration: none; -`; - -export default () => ( - - - - Policies - - - - - Compliance - - - - © {new Date().getFullYear()} Joyent, Inc. - - -); diff --git a/packages/images/src/routes.js b/packages/images/src/routes.js index 55eac78d..29140441 100644 --- a/packages/images/src/routes.js +++ b/packages/images/src/routes.js @@ -7,7 +7,8 @@ import { ViewContainer, Message, MessageDescription, - MessageTitle + MessageTitle, + Footer } from 'joyent-ui-toolkit'; import Breadcrumb from '@containers/breadcrumb'; @@ -16,7 +17,6 @@ import List from '@containers/list'; import Summary from '@containers/summary'; import Create from '@containers/create'; import Tags from '@containers/tags'; -import Footer from '@components/footer'; import { Route as ServerError } from '@root/server-error'; export default () => ( 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 ac6d1d17..a25cdac9 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/create-instance/__tests__/__image_snapshots__/affinity-ui-js-header-1-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/affinity-ui-js-header-1-snap.png index 902d3fc4..c3868281 100644 Binary files a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/affinity-ui-js-header-1-snap.png and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/affinity-ui-js-header-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/affinity-ui-js-header-tag-1-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/affinity-ui-js-header-tag-1-snap.png index 902d3fc4..c3868281 100644 Binary files a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/affinity-ui-js-header-tag-1-snap.png and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/affinity-ui-js-header-tag-1-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 c3fbb7a6..e57cb0fe 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__/package-ui-js-packages-expanded-1-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-expanded-1-snap.png index cd73f48a..aceabfdf 100644 Binary files a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-expanded-1-snap.png and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-expanded-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-is-vm-selected-1-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-is-vm-selected-1-snap.png index cd73f48a..aceabfdf 100644 Binary files a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-is-vm-selected-1-snap.png and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-is-vm-selected-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-loading-1-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-loading-1-snap.png index cd73f48a..aceabfdf 100644 Binary files a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-loading-1-snap.png and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-packages-name-stuff-image-name-stuff-1-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-packages-name-stuff-image-name-stuff-1-snap.png index 1802e255..a2145dfc 100644 Binary files a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-packages-name-stuff-image-name-stuff-1-snap.png and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-packages-name-stuff-image-name-stuff-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-pristine-false-1-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-pristine-false-1-snap.png index cd73f48a..aceabfdf 100644 Binary files a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-pristine-false-1-snap.png and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/package-ui-js-packages-pristine-false-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/affinity.spec.js.snap b/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/affinity.spec.js.snap index 7d053153..aeecfdf2 100644 --- a/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/affinity.spec.js.snap +++ b/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/affinity.spec.js.snap @@ -2,10 +2,16 @@ exports[`renders
without throwing 1`] = ` Array [ - + .c0 { + font-weight: 600; +} + + : -, +, " be on a", " ", " node as the instance(s) identified by the instance ", @@ -21,10 +27,16 @@ Array [ exports[`renders
without throwing 1`] = ` Array [ - + .c0 { + font-weight: 600; +} + + : -, +, " be on a", " ", " node as the instance(s) identified by the instance ", diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap b/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap index d62521ba..6c5a5b6a 100644 --- a/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap +++ b/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap @@ -1393,7 +1393,7 @@ exports[`renders without throwing 1`] = ` font-weight: 500; border-bottom-width: 0; color: rgba(73,73,73,1); - font-weight: bold; + font-weight: 600; } .c3:not(:first-child) { @@ -1941,7 +1941,7 @@ exports[`renders without throwing 1`] = ` font-weight: 500; border-bottom-width: 0; color: rgba(73,73,73,1); - font-weight: bold; + font-weight: 600; } .c3:not(:first-child) { @@ -2489,7 +2489,7 @@ exports[`renders without throwing 1`] = ` font-weight: 500; border-bottom-width: 0; color: rgba(73,73,73,1); - font-weight: bold; + font-weight: 600; } .c3:not(:first-child) { @@ -2955,7 +2955,7 @@ exports[`renders without font-weight: 500; border-bottom-width: 0; color: rgba(73,73,73,1); - font-weight: bold; + font-weight: 600; } .c3:not(:first-child) { @@ -3247,7 +3247,7 @@ exports[`renders without throwing 1`] = ` font-weight: 500; border-bottom-width: 0; color: rgba(73,73,73,1); - font-weight: bold; + font-weight: 600; } .c3:not(:first-child) { diff --git a/packages/my-joy-beta/src/components/create-instance/affinity.js b/packages/my-joy-beta/src/components/create-instance/affinity.js index e1809019..f6885699 100644 --- a/packages/my-joy-beta/src/components/create-instance/affinity.js +++ b/packages/my-joy-beta/src/components/create-instance/affinity.js @@ -1,4 +1,5 @@ import React, { Fragment } from 'react'; +import styled from 'styled-components'; import { Margin } from 'styled-components-spacing'; import Flex from 'styled-flex-component'; import { Field } from 'redux-form'; @@ -12,6 +13,10 @@ const style = { fontSize: '18px' }; +const Bold = styled.span` + font-weight: ${props => props.theme.font.weight.semibold}; +`; + const Values = touched => (