Merge branch 'main' into action-fix-app-auth-package

primer · Apr 23, 2024 · 9dc5785 · 9dc5785
2 parents 8a6f2b2 + 8d8895c
commit 9dc5785
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/.github/workflows/deploy_preview.yml b/.github/workflows/deploy_preview.yml
@@ -31,21 +31,21 @@ jobs:
         id: deployment
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
-          environment-url: ${{needs.deploy.outputs.deployment_url}}/storybook
+          environment-url: ${{needs.deploy.outputs.deployment_url}}storybook
           environment: storybook-preview
       - name: Update deployment status (success)
         if: success()
         uses: chrnorm/deployment-status@v2
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
-          environment-url: ${{needs.deploy.outputs.deployment_url}}/storybook
+          environment-url: ${{needs.deploy.outputs.deployment_url}}storybook
           state: 'success'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
       - name: Update deployment status (failure)
         if: failure()
         uses: chrnorm/deployment-status@v2
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
-          environment-url: ${{needs.deploy.outputs.deployment_url}}/storybook
+          environment-url: ${{needs.deploy.outputs.deployment_url}}storybook
           state: 'failure'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
diff --git a/docs/storybook/scripts/build-storybook b/docs/storybook/scripts/build-storybook
@@ -17,3 +17,6 @@ mkdir -p ../public/storybook
 
 # Remove manager-head after build to not interfere with dev builds
 rm .storybook/manager-head.html
+
+# create file to redirect to storybook
+echo '<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0;url=/storybook/"></head></html>' > ../public/index.html
diff --git a/docs/storybook/stories/Color/Base/Scales.stories.tsx b/docs/storybook/stories/Color/Base/Scales.stories.tsx
@@ -11,16 +11,16 @@ export default {
 const bgColors = [
   'base-color-black',
   'base-color-white',
-  'base-color-gray-0',
-  'base-color-gray-1',
-  'base-color-gray-2',
-  'base-color-gray-3',
-  'base-color-gray-4',
-  'base-color-gray-5',
-  'base-color-gray-6',
-  'base-color-gray-7',
-  'base-color-gray-8',
-  'base-color-gray-9',
+  'base-color-neutral-0',
+  'base-color-neutral-1',
+  'base-color-neutral-2',
+  'base-color-neutral-3',
+  'base-color-neutral-4',
+  'base-color-neutral-5',
+  'base-color-neutral-6',
+  'base-color-neutral-7',
+  'base-color-neutral-8',
+  'base-color-neutral-9',
   'base-color-blue-0',
   'base-color-blue-1',
   'base-color-blue-2',
@@ -106,7 +106,7 @@ const bgColors = [
 export const AllScales = () => {
   return (
     <div className="ColorScale--grid">
-      <Gray />
+      <Neutral />
       <Blue />
 
       <Green />
@@ -126,11 +126,11 @@ export const AllScales = () => {
 }
 AllScales.tags = ['includeSnapshot']
 
-export const Gray = () => {
-  const grayColors = bgColors.filter(color => color.includes('gray-'))
+export const Neutral = () => {
+  const neutralColors = bgColors.filter(color => color.includes('neutral-'))
   return (
     <div>
-      {grayColors.map(color => (
+      {neutralColors.map(color => (
         <ColorScale color={color} key={color} />
       ))}
     </div>