Merge branch 'dev' into tailwind

Author: devGregA

docs/assets/scss/common/_custom.scss

@@ -210,6 +210,25 @@ h1, h2, h3, h4, h5, h6,
   display: none;
 }
 
+// Pro badge — appears next to sidebar items with audience: pro
+// Box height is `1lh` so it equals one line-height of the surrounding text.
+.pro-badge {
+  display: inline-flex;
+  align-items: center;
+  box-sizing: border-box;
+  height: 1lh;
+  margin-left: 0.5em;
+  padding: 0 0.45em;
+  border: 1px solid #F2561D;
+  border-radius: 0.25rem;
+  background-color: rgba(#F2561D, 0.72);
+  color: #fff;
+  font-size: 0.7em;
+  font-weight: 500;
+  vertical-align: middle;
+  white-space: nowrap;
+}
+
 // ============================================================
 // Cards
 // ============================================================
@@ -419,6 +438,12 @@ h1, h2, h3, h4, h5, h6,
     border-color: #F2762E;
   }
 
+  // Pro badge in dark mode
+  .pro-badge {
+    background-color: rgba(#F2561D, 0.85);
+    border-color: #F2762E;
+  }
+
   // Selection color in dark mode
   ::selection {
     background-color: rgba(#82B0D9, 0.3);

…lling/hierarchy/OS__sla_configuration.md …ng/OS_hierarchy/OS__sla_configuration.mddocs/content/asset_modelling/hierarchy/OS__sla_configuration.md renamed to docs/content/asset_modelling/OS_hierarchy/OS__sla_configuration.md docs/content/asset_modelling/hierarchy/OS__sla_configuration.md renamed to docs/content/asset_modelling/OS_hierarchy/OS__sla_configuration.md

@@ -8,7 +8,7 @@ aliases:
 ---
 Each Product in DefectDojo can have its own Service Level Agreement (SLA) configuration, which represents the days your organization has to remediate or otherwise manage a Finding.
 
-SLA can be set based on either **[Finding Severity](/asset_modelling/hierarchy/product_hierarchy/#findings)** or **[Finding Risk](/asset_modelling/hierarchy/pro__priority_sla/)** (in DefectDojo Pro).
+SLA can be set based on either **[Finding Severity](/asset_modelling/os_hierarchy/product_hierarchy/#findings)** or **[Finding Risk](/asset_modelling/pro_hierarchy/priority_sla/)** (in DefectDojo Pro).
 
 ![image](images/sla_multiple.png)
 

…ierarchy/OS__source-code-repositories.md …ierarchy/OS__source-code-repositories.mddocs/content/asset_modelling/hierarchy/OS__source-code-repositories.md renamed to docs/content/asset_modelling/OS_hierarchy/OS__source-code-repositories.md docs/content/asset_modelling/hierarchy/OS__source-code-repositories.md renamed to docs/content/asset_modelling/OS_hierarchy/OS__source-code-repositories.md

@@ -0,0 +1,11 @@
+---
+title: "Product Hierarchy"
+audience: opensource
+date: 2021-02-02T20:46:29+01:00
+draft: false
+type: docs
+weight: 3
+sidebar:
+  collapsed: false
+exclude_search: true
+---

docs/content/asset_modelling/OS_hierarchy/_index.md

@@ -3,6 +3,7 @@ title: "Asset Hierarchy"
 date: 2021-02-02T20:46:29+01:00
 draft: false
 type: docs
+audience: pro
 weight: 3
 sidebar:
   collapsed: false

…/asset_modelling/hierarchy/benchmarks.md …set_modelling/OS_hierarchy/benchmarks.mddocs/content/asset_modelling/hierarchy/benchmarks.md renamed to docs/content/asset_modelling/OS_hierarchy/benchmarks.md docs/content/asset_modelling/hierarchy/benchmarks.md renamed to docs/content/asset_modelling/OS_hierarchy/benchmarks.md

@@ -82,7 +82,7 @@ Core Application [Organization]
     └── nginx
 ```
 
-In this diagram, every element under "Core Application" could be recorded as a separate Asset, with unique business criticality (see: [Priority & Risk](/asset_modelling/hierarchy/pro__priority_sla/#prioritization-engines/)), RBAC, and corresponding Engagements and Tests.  You could continue to test, and store results, on the parent Asset (for example, `webapp-backend`), but you could also run isolated testing on a particular child Asset (for example, `database`).
+In this diagram, every element under "Core Application" could be recorded as a separate Asset, with unique business criticality (see: [Priority & Risk](/asset_modelling/pro_hierarchy/priority_sla/#prioritization-engines/)), RBAC, and corresponding Engagements and Tests.  You could continue to test, and store results, on the parent Asset (for example, `webapp-backend`), but you could also run isolated testing on a particular child Asset (for example, `database`).
 
 ### Pen Tests: Isolated RBAC
 

…elling/hierarchy/product_health_grade.md …ing/OS_hierarchy/product_health_grade.mddocs/content/asset_modelling/hierarchy/product_health_grade.md renamed to docs/content/asset_modelling/OS_hierarchy/product_health_grade.md docs/content/asset_modelling/hierarchy/product_health_grade.md renamed to docs/content/asset_modelling/OS_hierarchy/product_health_grade.md

@@ -197,7 +197,7 @@ Note that when a Product's Prioritization Engine is changed, or a Prioritization
 
 Each Product in DefectDojo can have its own Service Level Agreement (SLA) configuration, which represents the days your organization has to remediate or otherwise manage a Finding.
 
-SLA can be set based on either **[Finding Severity](/asset_modelling/hierarchy/product_hierarchy/#findings)** or **[Finding Risk](/asset_modelling/hierarchy/pro__priority_sla/)** (in DefectDojo Pro).
+SLA can be set based on either **[Finding Severity](/asset_modelling/os_hierarchy/product_hierarchy/#findings)** or **[Finding Risk](/asset_modelling/pro_hierarchy/priority_sla/)** (in DefectDojo Pro).
 
 ![image](images/sla_multiple.png)