diff --git a/consoles/my-joy-images/src/components/menu.js b/consoles/my-joy-images/src/components/menu.js index 9f91ff39..bc5cf5cd 100644 --- a/consoles/my-joy-images/src/components/menu.js +++ b/consoles/my-joy-images/src/components/menu.js @@ -28,7 +28,7 @@ const Menu = ({ links = [] }) => { return ( - + {getMenuItems(_links)} diff --git a/consoles/my-joy-instances/src/components/navigation/__tests__/__image_snapshots__/footer-ui-js-footer-1-snap.png b/consoles/my-joy-instances/src/components/__tests__/__image_snapshots__/footer-ui-js-footer-1-snap.png similarity index 100% rename from consoles/my-joy-instances/src/components/navigation/__tests__/__image_snapshots__/footer-ui-js-footer-1-snap.png rename to consoles/my-joy-instances/src/components/__tests__/__image_snapshots__/footer-ui-js-footer-1-snap.png diff --git a/consoles/my-joy-instances/src/components/navigation/__tests__/__image_snapshots__/menu-ui-js-menu-1-snap.png b/consoles/my-joy-instances/src/components/__tests__/__image_snapshots__/menu-ui-js-menu-1-snap.png similarity index 100% rename from consoles/my-joy-instances/src/components/navigation/__tests__/__image_snapshots__/menu-ui-js-menu-1-snap.png rename to consoles/my-joy-instances/src/components/__tests__/__image_snapshots__/menu-ui-js-menu-1-snap.png diff --git a/consoles/my-joy-instances/src/components/navigation/__tests__/__image_snapshots__/menu-ui-js-menu-links-1-snap.png b/consoles/my-joy-instances/src/components/__tests__/__image_snapshots__/menu-ui-js-menu-links-1-snap.png similarity index 100% rename from consoles/my-joy-instances/src/components/navigation/__tests__/__image_snapshots__/menu-ui-js-menu-links-1-snap.png rename to consoles/my-joy-instances/src/components/__tests__/__image_snapshots__/menu-ui-js-menu-links-1-snap.png diff --git a/consoles/my-joy-instances/src/components/navigation/__tests__/__snapshots__/menu.spec.js.snap b/consoles/my-joy-instances/src/components/__tests__/__snapshots__/menu.spec.js.snap similarity index 97% rename from consoles/my-joy-instances/src/components/navigation/__tests__/__snapshots__/menu.spec.js.snap rename to consoles/my-joy-instances/src/components/__tests__/__snapshots__/menu.spec.js.snap index 55d5f294..f86182a6 100644 --- a/consoles/my-joy-instances/src/components/navigation/__tests__/__snapshots__/menu.spec.js.snap +++ b/consoles/my-joy-instances/src/components/__tests__/__snapshots__/menu.spec.js.snap @@ -4,6 +4,7 @@ exports[`renders without throwing 1`] = `null`; exports[`renders without throwing 1`] = ` .c2 { + margin-top: 0.75rem; margin-bottom: 1.875rem; } @@ -52,7 +53,7 @@ exports[`renders without throwing 1`] = ` text-decoration: none; cursor: pointer; padding: 0 0.75rem; - padding-bottom: 0.375rem; + padding-bottom: 0.9375rem; position: relative; } @@ -70,7 +71,7 @@ exports[`renders without throwing 1`] = ` .c3 { background: rgb(250,250,250); list-style-type: none; - padding: 0 0 0.1875rem 0; + padding: 0 0 0.75rem 0; max-height: 3.125rem; overflow-x: auto; overflow-y: hidden; diff --git a/consoles/my-joy-instances/src/components/navigation/__tests__/menu.spec.js b/consoles/my-joy-instances/src/components/__tests__/menu.spec.js similarity index 100% rename from consoles/my-joy-instances/src/components/navigation/__tests__/menu.spec.js rename to consoles/my-joy-instances/src/components/__tests__/menu.spec.js diff --git a/consoles/my-joy-instances/src/components/navigation/__tests__/menu.ui.js b/consoles/my-joy-instances/src/components/__tests__/menu.ui.js similarity index 100% rename from consoles/my-joy-instances/src/components/navigation/__tests__/menu.ui.js rename to consoles/my-joy-instances/src/components/__tests__/menu.ui.js diff --git a/consoles/my-joy-instances/src/components/navigation/menu.js b/consoles/my-joy-instances/src/components/menu.js similarity index 95% rename from consoles/my-joy-instances/src/components/navigation/menu.js rename to consoles/my-joy-instances/src/components/menu.js index 92940e55..ddafd7bf 100644 --- a/consoles/my-joy-instances/src/components/navigation/menu.js +++ b/consoles/my-joy-instances/src/components/menu.js @@ -28,7 +28,7 @@ const Menu = ({ links = [] }) => { return ( - + {getMenuItems(_links)} diff --git a/consoles/my-joy-instances/src/components/navigation/index.js b/consoles/my-joy-instances/src/components/navigation/index.js deleted file mode 100644 index 9d65b4b8..00000000 --- a/consoles/my-joy-instances/src/components/navigation/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default as Menu } from './menu'; diff --git a/consoles/my-joy-instances/src/containers/navigation/menu.js b/consoles/my-joy-instances/src/containers/navigation/menu.js index e1c2d3a1..a4511ef9 100644 --- a/consoles/my-joy-instances/src/containers/navigation/menu.js +++ b/consoles/my-joy-instances/src/containers/navigation/menu.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import get from 'lodash.get'; -import { Menu } from '@components/navigation'; +import Menu from '@components/menu'; export default connect((state, { match }) => { const instanceId = get(match, 'params.instance'); diff --git a/packages/ui-toolkit/src/section-list/index.js b/packages/ui-toolkit/src/section-list/index.js index 2881e3a0..ca1e531a 100644 --- a/packages/ui-toolkit/src/section-list/index.js +++ b/packages/ui-toolkit/src/section-list/index.js @@ -5,7 +5,7 @@ import remcalc from 'remcalc'; const UnorderedList = styled.ul` background: ${props => props.theme.disabled}; list-style-type: none; - padding: 0 0 ${remcalc(3)} 0; + padding: 0 0 ${remcalc(12)} 0; max-height: ${remcalc(50)}; overflow-x: auto; overflow-y: hidden; diff --git a/packages/ui-toolkit/src/section-list/item.js b/packages/ui-toolkit/src/section-list/item.js index 2e94aeab..0802b11c 100644 --- a/packages/ui-toolkit/src/section-list/item.js +++ b/packages/ui-toolkit/src/section-list/item.js @@ -26,7 +26,7 @@ export const Anchor = styled(BaseAnchor)` text-decoration: none; cursor: pointer; padding: 0 ${remcalc(12)}; - padding-bottom: ${remcalc(6)}; + padding-bottom: ${remcalc(15)}; position: relative; &.active {