Merge branch 'develop'

danielnaab · Jun 8, 2021 · 8b770dd · 8b770dd
2 parents 6244d44 + 2257a4a
commit 8b770dd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml
@@ -5,6 +5,8 @@ on:
     paths:
       - 'docs/**'
       - '.github/workflows/website-deploy.yml'
+      - 'xml'
+      - 'json'
   workflow_dispatch:
     branches:
       - main

diff --git a/build/metaschema b/build/metaschema
diff --git a/docs/assets/scss/schema-docs.scss b/docs/assets/scss/schema-docs.scss
@@ -113,6 +113,13 @@
         }
       }
     }
+    &:not([open]) {
+      summary {
+        .show-closed {
+          display: initial;
+        }
+      }
+    }
     summary {
       cursor: pointer;
       list-style-position: outside;

diff --git a/docs/content/_index.md b/docs/content/_index.md
@@ -1,7 +1,7 @@
 ---
 title: "OSCAL"
 ---
-{{% usa-hero image="automation-hero.png" calloutText="Automated" calloutAltText="Control-Based Assessment" buttonURL="/about/" buttonText="Learn More" %}}
+{{% usa-hero image="/automation-hero.png" calloutText="Automated" calloutAltText="Control-Based Assessment" buttonURL="/about/" buttonText="Learn More" %}}
 Supporting Control-Based<br/>
 Risk Management with<br/>
 Standardized Formats

diff --git a/docs/deploy.sh b/docs/deploy.sh
@@ -74,7 +74,7 @@ parse_args() {
   default_email=${GIT_DEPLOY_EMAIL:-}
 
   #repository to deploy to. must be readable and writable.
-  repo=origin
+  repo=upstream
 
   #append commit hash to the end of message by default
   append_hash=${GIT_DEPLOY_APPEND_HASH:-true}

diff --git a/docs/themes/uswds b/docs/themes/uswds
+3 −1		toolchains/xslt-M4/compose/make-model-map.xsl
+2 −4		toolchains/xslt-M4/converter-gen/produce-json-converter.xsl
+1 −1		toolchains/xslt-M4/converter-gen/produce-xml-converter.xsl
+2 −1		toolchains/xslt-M4/document/json/object-reference-html.xsl
+2 −0		toolchains/xslt-M4/document/json/object-tree.xsl
+67 −4		toolchains/xslt-M4/document/xml/element-reference-html.xsl
+80 −54		toolchains/xslt-M4/metapath/metapath-jsonizing-result.html
+6 −0		toolchains/xslt-M4/metapath/metapath-jsonizing.xspec