Merge branch '234-winter-22' into merge-summer-21-winter-22

Author: Dottenpixel

.circleci/config.yml

@@ -64,18 +64,20 @@ commands:
             if [[ "${CIRCLE_BRANCH}" = "${CURRENT_DEFAULT_BRANCH}" ]] ; then
               echo "Publishing to UPCOMING..."
               echo 'export HEROKU_APP_NAME=${HEROKU_APP_UPCOMING}' >> $BASH_ENV
+              echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-upcoming' >> $BASH_ENV
             elif [[ ${CIRCLE_TAG} =~ ^v[0-9]+\.[0-9]+\.[0-9]+-.+$ ]] ; then
               echo "Publishing to CORE-MAIN..."
               echo 'export HEROKU_APP_NAME=${HEROKU_APP_CORE_MAIN}' >> $BASH_ENV
+              echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-core-main' >> $BASH_ENV
             elif [[ ${CIRCLE_TAG} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
               echo "Publishing to CORE-PATCH..."
               echo 'export HEROKU_APP_NAME=${HEROKU_APP_CORE_PATCH}' >> $BASH_ENV
+              echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-core-patch' >> $BASH_ENV
             else
               echo "Publishing to pull-request review app..."
               echo 'export HEROKU_APP_NAME=slds-review-site-pr-${PR_NUMBER}' >> $BASH_ENV
               echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=true' >> $BASH_ENV
             fi
-            echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=${HEROKU_APP_NAME}' >> $BASH_ENV
             source $BASH_ENV
             echo $HEROKU_APP_NAME > workspace/heroku-app-name.txt
             echo $HEROKU_RELEASE_STORYBOOK_APP_NAME > workspace/heroku-release-storybook-app-name.txt
@@ -200,7 +202,12 @@ jobs:
       - run:
           name: Get Github pull-request number
           command: |
-            gh api /repos/salesforce-ux/design-system-internal/commits/${CIRCLE_SHA1}/pulls -H "Accept: application/vnd.github.groot-preview+json" | jq -r '.[].number' > workspace/gh-pr-num.txt && cat workspace/gh-pr-num.txt
+            set +e
+            gh pr view --json number,state,title,url > gh-pull-data.json
+            echo "=== Github pull-request API results ==="
+            cat gh-pull-data.json
+            echo "---------------------------------------"
+            cat gh-pull-data.json | jq -r '.number' > workspace/gh-pr-num.txt && cat workspace/gh-pr-num.txt
 
       - persist_to_workspace:
           root: workspace

shared/components/StylingHooksTable.jsx

@@ -36,7 +36,7 @@ const formatType = type => {
 class StylingHooksTable extends Component {
   render() {
     const { name, type } = this.props;
-    
+
     let vars;
     try {
       vars = require(`../../.generated/metadata/${type}s/${name}/styling-hooks.json`);
@@ -101,13 +101,13 @@ class StylingHooksTable extends Component {
                         })}
                       >
                         {ii === 0 ? (
-                          <td
+                          <th
                             className="hooks-table__col-category"
                             scope="rowgroup"
                             rowSpan={categoryVars.length}
                           >
                             {category}
-                          </td>
+                          </th>
                         ) : null}
                         <td>
                           <div className="slds-grid">

shared/styles/doc.scss

@@ -97,7 +97,7 @@ $frame-spacing: 0.5rem;
   display: flex;
   justify-content: flex-end;
   background: $light-gray-border-color;
-  margin: -1rem -1rem 1rem -1rem;
+  margin: -1rem -1rem 1rem;
   padding: 0.25rem 0.5rem;
 }
 
@@ -145,7 +145,6 @@ $frame-spacing: 0.5rem;
       flex: 1 1 auto;
       padding-left: 5%;
     }
-
   }
 }
 
@@ -233,7 +232,7 @@ blockquote.doc {
   font-size: 1.125rem;
   font-weight: 300;
   padding: 1rem;
-  margin: 0 0 1.5rem 0;
+  margin: 0 0 1.5rem;
   border: 1px solid $light-gray-border-color;
   border-left-width: 0.125rem;
 
@@ -300,6 +299,10 @@ ol.doc {
 
 ul.doc {
   list-style: disc;
+
+  ul.doc {
+    list-style: circle;
+  }
 }
 
 ol.doc {
@@ -349,12 +352,18 @@ ul.doc-toc {
 }
 
 .doc-toc li.doc a {
-  font-size: .875rem;
+  font-size: 0.875rem;
   font-weight: 700;
 }
 
-li.doc > ul.doc, li.doc > li.doc, ul.doc > ul.doc, ul.doc > li.doc {
-  margin-left: .4rem;
+li.doc > li.doc,
+ul.doc > li.doc {
+  margin-left: 0.4rem;
+}
+
+li.doc > ul.doc,
+ul.doc > ul.doc {
+  margin-left: 1rem;
 }
 
 li.doc > ul.doc {
@@ -366,17 +375,17 @@ li.doc > ul.doc {
 }
 
 .doc-toc > li.doc > ul.doc ul.doc > li.doc a {
-  font-size: .75rem;
+  font-size: 0.75rem;
   font-weight: 400;
   color: #4872ab;
 }
 
 h2.doc-toc-header {
   font-size: 1rem;
   border-bottom: 1px solid #d9dbdd;
-  margin-bottom: .5rem;
+  margin-bottom: 0.5rem;
   text-transform: uppercase;
-  letter-spacing: .1rem;
+  letter-spacing: 0.1rem;
 }
 
 .doc-tokens-group .slds-button {
@@ -421,7 +430,7 @@ h2.doc-toc-header {
   height: 8rem;
 }
 
-.doc-padding::before{
+.doc-padding:before {
   content: '';
   display: block;
   background: #1589ee;