Merge branch 'vmware-clarity:main' into main

vmware-clarity · Jul 28, 2022 · 9debb9a · 9debb9a
2 parents 4cfc4b4 + 388c065
commit 9debb9a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/pr-visual-regression.yml b/.github/workflows/pr-visual-regression.yml
@@ -35,6 +35,13 @@ jobs:
           path: dist/docs
           workflow: ${{github.event.workflow_run.workflow_id}}
           run_id: ${{github.event.workflow_run.id}}
+      - name: Fetch Commit
+        if: ${{steps.get_pr_event.outputs.targetBranch == 'main'}}
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          SOURCE_HEAD_REPO: ${{steps.get_pr_event.outputs.sourceHeadRepo}}
+          SOURCE_HEAD_SHA: ${{steps.get_pr_event.outputs.sourceHeadSha}}
+        run: git fetch https://x-access-token:${GITHUB_TOKEN}@github.com/${SOURCE_HEAD_REPO}.git ${SOURCE_HEAD_SHA}
       - name: Deploy Chromatic
         if: ${{steps.get_pr_event.outputs.targetBranch == 'main'}}
         timeout-minutes: 5

diff --git a/projects/angular/package.json b/projects/angular/package.json
@@ -18,8 +18,8 @@
     "url": "https://github.com/vmware-clarity/ng-clarity/issues"
   },
   "peerDependencies": {
-    "@angular/common": "^13.0.0",
-    "@angular/core": "^13.0.0",
+    "@angular/common": "13 || 14",
+    "@angular/core": "13 || 14",
     "@cds/core": "^5.6.0 || ^6.0.0"
   }
 }
diff --git a/projects/angular/src/wizard/_wizard.clarity.scss b/projects/angular/src/wizard/_wizard.clarity.scss
@@ -74,7 +74,6 @@
       flex: 1 1 auto;
       @include css-var(color, clr-wizard-main-textColor, $clr-wizard-main-textColor, $clr-use-custom-properties);
       width: 100%;
-      min-height: 70vh;
     }
 
     .modal-footer {
@@ -379,6 +378,9 @@
     .modal-body-wrapper {
       // overriding forced style on .modal
       max-height: 100%;
+      display: flex;
+      flex-grow: 1;
+      width: 100%;
     }
 
     &.wizard-md {