Merge branch 'develop' into feature/dev-container

magento · May 16, 2023 · 67f683b · 67f683b
2 parents f934a42 + 4e204fd
commit 67f683b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/packages/pwa-buildpack/envVarDefinitions.json b/packages/pwa-buildpack/envVarDefinitions.json
@@ -6,7 +6,7 @@
                 {
                     "name": "MAGENTO_BACKEND_URL",
                     "type": "url",
-                    "desc": "Connect to an instance of Magento 2.3 by specifying its public domain name.",
+                    "desc": "Connect to an instance of Magento by specifying its public domain name.",
                     "example": "https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/"
                 }
             ]

diff --git a/packages/pwa-buildpack/lib/Utilities/__tests__/__snapshots__/createDotEnvFile.spec.js.snap b/packages/pwa-buildpack/lib/Utilities/__tests__/__snapshots__/createDotEnvFile.spec.js.snap
@@ -35,7 +35,7 @@ exports[`returns valid dotenv file if env is valid 1`] = `
 
 #### Connecting to a Magento store #############################################
 #
-#   Connect to an instance of Magento 2.3 by specifying its public domain name.
+#   Connect to an instance of Magento by specifying its public domain name.
 MAGENTO_BACKEND_URL=https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/
 #
 ################################################################################

diff --git a/packages/venia-ui/lib/components/Header/__tests__/__snapshots__/header.spec.js.snap b/packages/venia-ui/lib/components/Header/__tests__/__snapshots__/header.spec.js.snap
@@ -23,10 +23,6 @@ Array [
       >
         <NavTrigger />
       </div>
-      <OnlineIndicator
-        hasBeenOffline={false}
-        isOnline={true}
-      />
       <MegaMenu />
       <div
         className="secondaryActions"
@@ -42,5 +38,9 @@ Array [
       id="pageLoadingIndicator"
     />
   </header>,
+  <OnlineIndicator
+    hasBeenOffline={false}
+    isOnline={true}
+  />,
 ]
 `;
diff --git a/packages/venia-ui/lib/components/Header/header.js b/packages/venia-ui/lib/components/Header/header.js
@@ -68,10 +68,7 @@ const Header = props => {
                     <div className={classes.primaryActions}>
                         <NavTrigger />
                     </div>
-                    <OnlineIndicator
-                        hasBeenOffline={hasBeenOffline}
-                        isOnline={isOnline}
-                    />
+
                     <Link
                         aria-label={title}
                         to={resourceUrl('/')}
@@ -93,6 +90,10 @@ const Header = props => {
                 {searchBar}
                 <PageLoadingIndicator absolute />
             </header>
+            <OnlineIndicator
+                hasBeenOffline={hasBeenOffline}
+                isOnline={isOnline}
+            />
         </Fragment>
     );
 };

diff --git a/packages/venia-ui/lib/components/Header/onlineIndicator.module.css b/packages/venia-ui/lib/components/Header/onlineIndicator.module.css
@@ -7,9 +7,8 @@
     composes: ml-18 from global;
     composes: w-[3rem] from global;
     grid-area: primary;
-
     composes: sm_justify-self-start from global;
-    composes: sm_ml-10 from global;
+    composes: ml-6 from global;
 }
 
 @media (min-width: 640px) {