diff --git a/.DS_Store b/.DS_Store index 8579da5b3..6e91d3ba1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/24/47a7decfa5d35f25aef3941b0111c382731e60c408224e7d95bad539d8ffe5 b/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/24/47a7decfa5d35f25aef3941b0111c382731e60c408224e7d95bad539d8ffe5 deleted file mode 100644 index ff3745416..000000000 --- a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/24/47a7decfa5d35f25aef3941b0111c382731e60c408224e7d95bad539d8ffe5 +++ /dev/null @@ -1,2 +0,0 @@ -I"ó

FedRAMP updated the Plan of Actions and Milestones (POA&M) template to include two new columns. The additional columns were added at the behest of agency partners to help them track Cybersecurity and Infrastructure Security Agency (CISA) Binding Operational Directive (BOD) 22-01 findings, and the associated Common Vulnerabilities and Exposures (CVEs).

-:ET \ No newline at end of file diff --git a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/2a/1c643656e3a6e1bec4b78fed528c33e6f9acdc7c520b7749e1fd6e3893f3fe b/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/2a/1c643656e3a6e1bec4b78fed528c33e6f9acdc7c520b7749e1fd6e3893f3fe deleted file mode 100644 index c861463c3..000000000 --- a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/2a/1c643656e3a6e1bec4b78fed528c33e6f9acdc7c520b7749e1fd6e3893f3fe +++ /dev/null @@ -1,2 +0,0 @@ -I"I

FedRAMP security control baselines specify control parameter requirements and organizational parameters specific to the provider’s control implementation. Since certain controls may be required to govern Agency user interaction, control organizational parameters may need to be included in the task order and specified. The FedRAMP PMO suggests that agencies review the FedRAMP security control baseline, and that agencies do not contractually specify parameters for controls in the FedRAMP baseline, except from the perspective of a consumer’s implementation of a control.

-:ET \ No newline at end of file diff --git a/_data/navbar.yml b/_data/navbar.yml index 47e646657..75fd42f18 100755 --- a/_data/navbar.yml +++ b/_data/navbar.yml @@ -107,6 +107,13 @@ assigned: show_in_menu: true show_in_footer: false + - + text: ET Framework + href: pages/et-framework.md + permalink: /et-framework/ + show_in_menu: true + show_in_footer: false + - text: Blog href: pages/blog.md diff --git a/_layouts/artificial-intelligence.html b/_layouts/artificial-intelligence.html new file mode 100644 index 000000000..417b12cf0 --- /dev/null +++ b/_layouts/artificial-intelligence.html @@ -0,0 +1,209 @@ +--- +layout: full-width +--- + + +
+
+ +
+
+ + + +
+
+
+ +
+
+
diff --git a/_layouts/et-framework.html b/_layouts/et-framework.html new file mode 100644 index 000000000..dfc705609 --- /dev/null +++ b/_layouts/et-framework.html @@ -0,0 +1,343 @@ +--- +layout: full-width +--- + + +
+
+ +
+
+ + + +
+
+
+ + +
+ +
+
+
+
diff --git a/_layouts/raci-matrix.html b/_layouts/raci-matrix.html new file mode 100644 index 000000000..6df7f5dfb --- /dev/null +++ b/_layouts/raci-matrix.html @@ -0,0 +1,155 @@ +--- +layout: full-width +--- + + +
+
+
+ + + +
+
+
diff --git a/_sass/_pagenav.scss b/_sass/_pagenav.scss index d7a4fc6d9..060f4cbd0 100755 --- a/_sass/_pagenav.scss +++ b/_sass/_pagenav.scss @@ -8,7 +8,7 @@ zoom: 1; } -#top-menu li { +#top-menu li, .external-links li { margin: 0 -12px; padding: 0 24px; font-family: $title-font; @@ -17,6 +17,17 @@ border-left: solid 3px $light-gray; } +.external-links { + margin-left: -40px; +} + +.external-links li { + list-style: none; + a{ + text-decoration: none; + } +} + #top-menu nav { position: relative; } @@ -32,15 +43,19 @@ #top-menu a { display: block; line-height: 1.5rem; - color: $red; + color: $mid-gray; text-decoration: none; padding: 20px 0; -webkit-transition: 0.2s; transition: 0.2s; } +#top-menu li.active a { + color: $red; +} + #top-menu a:hover { - opacity: 0.8; + color: $red; } #top-menu li.active { @@ -53,11 +68,24 @@ } } +#top-menu li.in-page-sub { + padding-left: 40px; + // margin-top: -30px; + font-size: .75rem; + + a { + padding: 0; + } +} .in-page-nav-section { margin-top: -620px; } +.framework-main-section { + margin-top: -710px; +} + ul.in-page-nav-menu { padding-left: 0; margin: 0; diff --git a/_sass/_pages.scss b/_sass/_pages.scss index 376c874c9..6a63cb3ed 100755 --- a/_sass/_pages.scss +++ b/_sass/_pages.scss @@ -1125,4 +1125,34 @@ ol.training-step-sub { border-right: solid 1px $light-gray; } } +} + +table.raci-matrix { + border: solid 1px $light-gray; + border-collapse: collapse; + + th.row-header { + text-align: left; + padding: 8px 14px; + line-height: 1.25em; + + } + + tr.head-row th { + vertical-align: bottom; + line-height: 1.25em; + } + + td { + text-align: center; + padding: 8px 14px; + border-left: solid 1px $light-gray; + } +} + +.quick-links h4 { + padding: 0; + margin: 0; + color: $red; + font-size: 1rem; } \ No newline at end of file diff --git a/pages/artificial-intelligence.md b/pages/artificial-intelligence.md new file mode 100644 index 000000000..e9c9cc9a9 --- /dev/null +++ b/pages/artificial-intelligence.md @@ -0,0 +1,11 @@ +--- +layout: artificial-intelligence +title: Artificial Intelligence +tab-title: Artificial Intelligence +permalink: /et-framework/artificial-intelligence/ +body-class: page-training +summary: +tags: + + +--- diff --git a/pages/et-framework.md b/pages/et-framework.md new file mode 100644 index 000000000..d7e784805 --- /dev/null +++ b/pages/et-framework.md @@ -0,0 +1,11 @@ +--- +layout: et-framework +title: Emerging Technology Prioritization Framework +tab-title: Emerging Technology Prioritization Framework +permalink: /et-framework/ +body-class: page-training +summary: +tags: + + +--- diff --git a/pages/raci-matrix.md b/pages/raci-matrix.md new file mode 100644 index 000000000..96bb58897 --- /dev/null +++ b/pages/raci-matrix.md @@ -0,0 +1,11 @@ +--- +layout: raci-matrix +title: RACI Matrix +tab-title: RACI-Matrix +permalink: /et-framework/raci-matrix/ +body-class: page-training +summary: +tags: + + +---