diff --git a/src/components/ActionMenu/ActionMenu.scss b/src/components/ActionMenu/ActionMenu.scss index 9276f9db288..013bc2fe20f 100644 --- a/src/components/ActionMenu/ActionMenu.scss +++ b/src/components/ActionMenu/ActionMenu.scss @@ -2,7 +2,6 @@ .ActionMenu { &:not(.rollup) { - margin-top: spacing(tight); margin-left: -$menu-action-padding-x; } } diff --git a/src/components/ActionMenu/ActionMenu.tsx b/src/components/ActionMenu/ActionMenu.tsx index 8a6245fc81e..a92af5cae7c 100644 --- a/src/components/ActionMenu/ActionMenu.tsx +++ b/src/components/ActionMenu/ActionMenu.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import classNames from 'classnames'; +import {classNames} from '@shopify/css-utilities'; import { ActionListSection, diff --git a/src/components/Page/components/Header/Header.scss b/src/components/Page/components/Header/Header.scss index 965240a1c67..cbc4c9297f9 100644 --- a/src/components/Page/components/Header/Header.scss +++ b/src/components/Page/components/Header/Header.scss @@ -75,11 +75,14 @@ $action-menu-rollup-computed-width: icon-size() + (spacing(tight) * 2); } .ActionMenuWrapper { + margin-top: spacing(tight); + // stylelint-disable-next-line selector-max-class .mobileView & { position: absolute; top: spacing(loose) + (control-height() / 4); right: 0; + margin-top: 0; @include page-content-when-not-fully-condensed { right: -(spacing(tight));