Merge pull request #712 from usnistgov/css-updates

update css and templates
usnistgov · Dec 7, 2023 · faaec11 · faaec11
2 parents 6a168e4 + 81a887a
commit faaec11
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ Gemfile.lock
 *.css.map
 *~
 _pdf/
+_template_workspace/
diff --git a/_FIPS201/accreditation.md b/_FIPS201/accreditation.md
@@ -5,7 +5,9 @@ navOrder: 11
 navTitle: Accreditation
 permalink: /accreditation/
 anchor: s-a
+section: A
 ---
+
 # Appendix A. PIV Validation, Certification, and Accreditation {#s-a}
 
 _This appendix is normative._ It provides compliance requirements for PIV validation, certification, and accreditation.

diff --git a/_FIPS201/authentication.md b/_FIPS201/authentication.md
@@ -5,6 +5,7 @@ navOrder: 9
 navTitle: Authentication
 permalink: /authentication/
 anchor: s-6
+section: 6
 ---
 
 ~~~

diff --git a/_FIPS201/federation.md b/_FIPS201/federation.md
@@ -5,6 +5,7 @@ navOrder: 10
 navTitle: Federation
 permalink: /federation/
 anchor: s-7
+section: 7
 ---
 
 # 7. Federation Considerations for PIV {#s-7}

diff --git a/_FIPS201/frontend.md b/_FIPS201/frontend.md
@@ -5,6 +5,7 @@ navOrder: 7
 navTitle: Front-End
 permalink: /frontend/
 anchor: s-4
+section: 4
 ---
 
 # 4. PIV Front-End Subsystem {#s-4}

diff --git a/_FIPS201/glossary.md b/_FIPS201/glossary.md
@@ -5,6 +5,7 @@ navOrder: 13
 navTitle: Glossary
 permalink: /glossary/
 anchor: s-c
+section: C
 ---
 
 # Appendix C. Glossary of Terms, Acronyms, and Notations {#s-c}

diff --git a/_FIPS201/introduction.md b/_FIPS201/introduction.md
@@ -5,7 +5,9 @@ navOrder: 4
 navTitle: Introduction
 permalink: /introduction/
 anchor: s-1
+section: 1
 ---
+
 # 1. Introduction {#s-1}
 
 _This section is informative except where otherwise marked as normative._ It provides background information for understanding the

diff --git a/_FIPS201/keymanagement.md b/_FIPS201/keymanagement.md
@@ -5,6 +5,7 @@ navOrder: 8
 navTitle: Keys
 permalink: /keymanagement/
 anchor: s-5
+section: 5
 ---
 
 # 5. PIV Key Management Requirements {#s-5}

diff --git a/_FIPS201/oid.md b/_FIPS201/oid.md
@@ -5,6 +5,7 @@ navOrder: 12
 navTitle: OID
 permalink: /oid/
 anchor: s-b
+section: B
 ---
 
 # Appendix B. PIV Object Identifiers and Certificate Extension {#s-b}

diff --git a/_FIPS201/references.md b/_FIPS201/references.md
@@ -5,6 +5,7 @@ navOrder: 14
 navTitle: References
 permalink: /references/
 anchor: s-d
+section: D
 ---
 
 # Appendix D. References {#s-d}

diff --git a/_FIPS201/requirements.md b/_FIPS201/requirements.md
@@ -5,7 +5,9 @@ navOrder: 5
 navTitle: Requirements
 permalink: /requirements/
 anchor: s-2
+section: 2
 ---
+
 # 2. Common Identification, Security, and Privacy Requirements {#s-2}
 
 _This section is normative._ It addresses the fundamental control and security objectives outlined in [[HSPD-12]](references.md#ref-HSPD-12), including

diff --git a/_FIPS201/revisions.md b/_FIPS201/revisions.md
@@ -5,7 +5,9 @@ navOrder: 15
 navTitle: Revisions
 permalink: /revisions/
 anchor: s-e
+section: E
 ---
+
 # Appendix E. Revision History {#s-e}
 
 _This appendix is informative._ It provides an overview of the changes to FIPS 201 since its initial release.

diff --git a/_FIPS201/system.md b/_FIPS201/system.md
@@ -5,7 +5,9 @@ navOrder: 6
 navTitle: System
 permalink: /system/
 anchor: s-3
+section: 3
 ---
+
 # 3. PIV System Overview {#s-3}
 
 _This section is informative._ It provides an overview of the different components of the PIV system.

diff --git a/_includes/NISTPagesHeader.html b/_includes/NISTPagesHeader.html
@@ -13,7 +13,7 @@
             src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=DOC&subagency=NIST&pua=UA-66610693-1&yt=true&exts=ppsx,pps,f90,sch,rtf,wrl,txz,m1v,xlsm,msi,xsd,f,tif,eps,mpg,xml,pl,xlt,c"></script>
 
 	<link rel="stylesheet" href="https://pages.nist.gov/nist-header-footer/css/nist-combined.css">
-	<script src="https://pages.nist.gov/nist-header-footer/js/jquery-1.9.0.min.js" type="text/javascript"></script>
+	<script src="https://code.jquery.com/jquery-3.6.2.min.js" type="text/javascript"></script>
 	<script src="https://pages.nist.gov/nist-header-footer/js/nist-header-footer.js" type="text/javascript" defer="defer"></script>
 	<script src="https://unpkg.com/simple-jekyll-search/dest/simple-jekyll-search.min.js"></script>
 

diff --git a/_includes/sidenav.html b/_includes/sidenav.html
@@ -34,9 +34,9 @@
                 {% endif %}
 
                 {% if page.collapsed and p.anchor %}
-                    <li class="{{ scurrent }}"><a href="{{ site.baseurl }}/{{ page.collection }}.html#{{ p.anchor }}">{{ p.navTitle }}</a></li>
+                    <li class="{{ scurrent }}"><a href="{{ site.baseurl }}/{{ page.collection }}.html#{{ p.anchor }}">{% if p.section %}<span class="section">{{ p.section }}</span>{% endif %}{{ p.navTitle }}</a></li>
                 {% else %}
-                    <li class="{{ scurrent }}"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.navTitle }}</a></li>
+                    <li class="{{ scurrent }}"><a href="{{ site.baseurl }}{{ p.url }}">{% if p.section %}<span class="section">{{ p.section }}</span>{% endif %}{{ p.navTitle }}</a></li>
                 {% endif %}
 
               {% endif %}

diff --git a/static/css/NISTPages.css b/static/css/NISTPages.css
@@ -85,13 +85,17 @@ ul.audiences li {
 
 .navbar-fixed-left .navbar-nav > li {
   float: none;  /* Cancel default li float: left */
-  width: 139px;
+  width: 155px;
 }
 
 .container {
   padding-left: 160px;
 }
 
+.navbar-fixed-left ~ #nistfootergoeshere {
+  padding-left: 160px;
+}
+
 .page-switch {
   padding-left: 165px;
   padding-right: 5px;
@@ -121,6 +125,7 @@ ul.audiences li {
 .navbar-fixed-left .navbar-nav .subnav {
   font-size: smaller;
   line-height: 1.1em;
+  padding-left: 20px;
 }
 
 .navbar-fixed-left .navbar-nav .subnav>li {
@@ -133,6 +138,16 @@ ul.audiences li {
   list-style: disc;
 }
 
+.navbar-fixed-left .navbar-nav .subnav>li span.section {
+  font-size: 0.8em;
+  color: white;
+  background: #8f8f8f;
+  border-radius: 2px;
+  padding-left: 2px;
+  padding-right: 2px;
+  margin-right: 2px;
+}
+
 .navbar-fixed-left .navbar-nav .subnav a {
   color: black;
 }
@@ -245,6 +260,39 @@ h6:hover .header-link {
   opacity: 1;
 }
 
+/* Automated header numbering, when data-section attribute is set */
+
+h1 {
+    counter-reset: h2
+}
+
+h2 {
+    counter-reset: h3
+}
+
+h3 {
+    counter-reset: h4
+}
+
+h1[data-section]:before {
+    content: attr(data-section) ". "
+}
+
+h2[data-section]:before {
+    counter-increment: h2;
+    content: attr(data-section) "." counter(h2) ". "
+}
+
+h3[data-section]:before {
+    counter-increment: h3;
+    content: attr(data-section) "." counter(h2) "." counter(h3) ". "
+}
+
+h4[data-section]:before {
+    counter-increment: h4;
+    content: attr(data-section) "." counter(h2) "." counter(h3) "." counter(h4) ". "
+}
+
 /* Targeted section headers are highlighted. */
 
 .target {
@@ -410,6 +458,10 @@ strong.normative {
     padding-right: 5px;
   }
 
+  .navbar-fixed-left ~ #nistfootergoeshere {
+    padding-left: 0px;
+  }
+
   /* All images shouldn't be larger than the page. */
 
   img {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ Gemfile.lock @@
     *.css.map
     *~
     _pdf/
+    _template_workspace/