Merge branch 'master' into feat/github-import-wizard

concrete-utopia · Oct 28, 2024 · 8a1b91a · 8a1b91a
2 parents 20f4dc5 + ac18c51
commit 8a1b91a
Show file tree

Hide file tree

Showing 73 changed files with 6,404 additions and 1,516 deletions.
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -255,7 +255,7 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           edit-mode: replace
           body: |
-            ## [Try me](https://${{ secrets.STAGING_SERVER }}/p/?accessLevel=public&branch_name=${{ steps.extract_branch.outputs.branch }})
+            ## [Try me](https://${{ secrets.STAGING_SERVER }}/p/?accessLevel=public&clone=concrete-utopia/hydrogen-editions-24&branch_name=${{ steps.extract_branch.outputs.branch }})
 
   performance-test:
     name: Run Performance Tests

diff --git a/editor/src/components/canvas/__snapshots__/ui-jsx-canvas-bugs.spec.tsx.snap b/editor/src/components/canvas/__snapshots__/ui-jsx-canvas-bugs.spec.tsx.snap
@@ -232,8 +232,23 @@ Object {
         "y": 0,
       },
       "padding": Object {},
+      "parentContainerGridProperties": Object {
+        "gridAutoColumns": null,
+        "gridAutoFlow": null,
+        "gridAutoRows": null,
+        "gridTemplateColumns": null,
+        "gridTemplateRows": null,
+      },
+      "parentContainerGridPropertiesFromProps": Object {
+        "gridAutoColumns": null,
+        "gridAutoFlow": null,
+        "gridAutoRows": null,
+        "gridTemplateColumns": null,
+        "gridTemplateRows": null,
+      },
       "parentFlexDirection": null,
       "parentFlexGap": 0,
+      "parentGridCellGlobalFrames": null,
       "parentHugsOnMainAxis": false,
       "parentJustifyContent": null,
       "parentLayoutSystem": "flow",
@@ -383,8 +398,23 @@ Object {
         "y": 0,
       },
       "padding": Object {},
+      "parentContainerGridProperties": Object {
+        "gridAutoColumns": null,
+        "gridAutoFlow": null,
+        "gridAutoRows": null,
+        "gridTemplateColumns": null,
+        "gridTemplateRows": null,
+      },
+      "parentContainerGridPropertiesFromProps": Object {
+        "gridAutoColumns": null,
+        "gridAutoFlow": null,
+        "gridAutoRows": null,
+        "gridTemplateColumns": null,
+        "gridTemplateRows": null,
+      },
       "parentFlexDirection": null,
       "parentFlexGap": 0,
+      "parentGridCellGlobalFrames": null,
       "parentHugsOnMainAxis": false,
       "parentJustifyContent": null,
       "parentLayoutSystem": "flow",