Merge pull request #1725 from Shopify/actionmenu-margin-top

[ActionMenu] Move margin-top to Page > Header.scss
Shopify · Jun 24, 2019 · 9181edd · 9181edd
2 parents 776d652 + 17f5553
commit 9181edd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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));