Skip to content

Commit

Permalink
Initial Schema Formatting (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
howieavp76 authored and anweiss committed Feb 27, 2019
1 parent 52ef065 commit 3641845
Show file tree
Hide file tree
Showing 5 changed files with 194 additions and 146 deletions.
64 changes: 20 additions & 44 deletions docs_jekyll_uswds/_layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,58 +1,34 @@
---
---
--- ---
<!DOCTYPE html>
<html lang="{{ page.lang | default: site.lang | default: 'en-US' }}">

<head>
{% include meta.html %}
{% include styles.html %}
{% if site.google_analytics_ua or site.dap_agency %}
{% include analytics.html %}
{% endif %}
<!-- <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" defer="defer"></script>
<meta name="viewport" content="width=device-width, initial-scale=1">
{% include meta.html %} {% include styles.html %} {% if site.google_analytics_ua or site.dap_agency %} {% include analytics.html %} {% endif %}
<!-- <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" defer="defer"></script>
<script src="https://pages.nist.gov/nist-header-footer/js/nist-header-footer.js" type="text/javascript" defer="defer"></script> -->
</head>

<body class="{{ layout.class }} {{ page.class }} {% if site.site_width %}site-{{ site.site_width }}{% endif %}">

{% include skipnav.html %}
{% include header.html %}
{% include skipnav.html %} {% include header.html %} {% assign hero = page.hero %} {% include components/hero.html %} {% if page.tagline and page.intro %}
<section class="usa-grid usa-section">
<div class="usa-width-one-third">
<h2>{{ page.tagline }}</h2>
</div>
<div class="usa-width-two-thirds">
{{ page.intro | markdownify }}
</div>
</section>
{% endif %} {% capture _graphics %} {% include graphic-list.html graphics=page.graphics %} {% endcapture %} {% if page.graphics_position != 'after' %} {{ _graphics }} {% endif %}

{% assign hero = page.hero %}
{% include components/hero.html %}
<main id="main-content" {% for _attr in layout.main %} {{ _attr[0] }}="{{ _attr[1] }}" {% endfor %}>
{{ content }}
</main>

{% if page.tagline and page.intro %}
<section class="usa-grid usa-section">
<div class="usa-width-one-third">
<h2>{{ page.tagline }}</h2>
</div>
<div class="usa-width-two-thirds">
{{ page.intro | markdownify }}
</div>
</section>
{% endif %}

{% capture _graphics %}
{% include graphic-list.html graphics=page.graphics %}
{% endcapture %}

{% if page.graphics_position != 'after' %}
{{ _graphics }}
{% endif %}

<main id="main-content" {% for _attr in layout.main %} {{ _attr[0] }}="{{ _attr[1] }}" {% endfor %}>
{{ content }}
</main>

{% if page.graphics_position == 'after' %}
{{ _graphics }}
{% endif %}

{% include footer.html %}

{% include scripts.html %}
{% if page.graphics_position == 'after' %} {{ _graphics }} {% endif %} {% include footer.html %} {% include scripts.html %}

</body>

</html>
</html>
175 changes: 98 additions & 77 deletions docs_jekyll_uswds/_sass/components/_nist-combined.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,155 +4,176 @@
*
*/


/* Header Styles */

.nist-header {
background: #000;
font-family: Helvetica, Arial, sans-serif;
padding: 10px 16px 0;
font-size: 16px;
background: #000;
font-family: Helvetica, Arial, sans-serif;
padding: 10px 16px 0;
font-size: 16px;
}

.nist-header__logo-link {
display: inline-block;
height: 35px;
display: inline-block;
height: 35px;
}

.nist-header__logo-icon {
fill: #fff;
display: inline-block;
height: 16px;
position: relative;
top: -2px;
margin-right: 2px;
fill: #fff;
display: inline-block;
height: 16px;
position: relative;
top: -2px;
margin-right: 2px;
}

.nist-header__logo-image {
fill: #fff;
display: inline-block;
height: 24px;
width: 90px;
fill: #fff;
display: inline-block;
height: 24px;
width: 90px;
}


/* Limit main content area width */

.nist-main {
margin-left: auto;
margin-right: auto;
max-width: 1200px;
padding: 0 16px;
box-sizing: border-box;
margin-left: auto;
margin-right: auto;
max-width: 1200px;
padding: 0 16px;
box-sizing: border-box;
}


/* Make sure body has no margin or padding when using only this header component */

body {
padding: 0;
margin: 0;
padding: 0;
margin: 0;
}


/* Footer styles */

.nist-footer {
background: #333333;
position: relative;
z-index: 200;
font-family: Helvetica, Arial, sans-serif;
font-size: 16px;
box-sizing: border-box;
background: #333333;
position: relative;
z-index: 200;
font-family: Helvetica, Arial, sans-serif;
font-size: 16px;
box-sizing: border-box;
}

.nist-footer__inner {
margin-left: auto;
margin-right: auto;
max-width: 1200px;
padding: 0 16px;
margin-left: auto;
margin-right: auto;
max-width: 1200px;
padding: 0 16px;
}

.nist-footer__inner:after {
content: "";
display: table;
clear: both;
content: "";
display: table;
clear: both;
}

.nist-footer {
background: #333333;
color: white;
padding: 40px 0px;
position: relative;
background: #333333;
color: white;
padding: 40px 0px;
position: relative;
}

.nist-footer a {
color: white;
text-decoration: none;
color: white;
text-decoration: none;
}

.nist-footer .nist-footer__logo img {
width: 200px;
display: block;
margin-left: auto;
margin-right: auto;
margin-top: 30px;
width: 200px;
display: block;
margin-left: auto;
margin-right: auto;
margin-top: 30px;
}

.nist-footer__menu {
clear: both;
margin-bottom: 10px;
clear: both;
margin-bottom: 10px;
}

.nist-footer__menu.first {
padding-top: 20px;
padding-top: 20px;
}

.nist-footer__menu ul {
margin: 0;
padding: 0;
list-style: none;
text-align: center;
margin: 0;
padding: 0;
list-style: none;
text-align: center;
}

.nist-footer__menu-item {
display: inline-block;
font-size: 14px;
padding: 0;
margin-left: 0;
display: inline-block;
font-size: 14px;
padding: 0;
margin-left: 0;
}

.nist-footer__menu-item:after {
content: '|';
margin-right: 1.6px;
display: inherit;
position: static;
font: inherit;
line-height: inherit;
color: inherit;
content: '|';
margin-right: 1.6px;
display: inherit;
position: static;
font: inherit;
line-height: inherit;
color: inherit;
}

.nist-footer__menu-item:last-child:after {
content: none;
content: none;
}

.nist-footer__menu-item a {
font-weight: normal;
margin-right: 6px;
white-space: nowrap;
padding: 0.5em 0;
display: inline-block;
font-weight: normal;
margin-right: 6px;
white-space: nowrap;
padding: 0.5em 0;
display: inline-block;
}


/**
* Stick footer to bottom of page
* Source: https://css-tricks.com/couple-takes-sticky-footer/
*/

html.nist-footer-bottom,
html.nist-footer-bottom,
html.nist-footer-bottom body {
height: 100%;
height: 100%;
}

html.nist-footer-bottom body {
display: flex;
flex-direction: column;
display: flex;
flex-direction: column;
}

html.nist-footer-bottom #main {
flex: 1 0 auto;
flex: 1 0 auto;
}

html.nist-footer-bottom .nist-footer {
flex-shrink: 0;
flex-shrink: 0;
}

.travis {
display: inline-block;
color: black;
text-align: center;
padding: 14px;
text-decoration: none;
font-size: 17px;
border-radius: 5px;
}
6 changes: 3 additions & 3 deletions docs_jekyll_uswds/_sass/uswds/uswds.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
@import 'lib/bourbon';
@import 'lib/neat';
@import 'lib/normalize';

// Core -------------- //
@import 'core/variables';
@import 'core/fonts';
@import 'core/grid';
@import 'core/utilities';
@import 'core/base';

// Elements -------------- //
// Styles basic HTML elements
@import 'elements/buttons';
Expand All @@ -23,7 +21,6 @@
@import 'elements/list';
@import 'elements/table';
@import 'elements/typography';

// Components -------------- //
@import 'components/accordions';
@import 'components/alerts';
Expand All @@ -40,3 +37,6 @@
@import 'components/section';
@import 'components/sidenav';
@import 'components/skipnav';
//Bootstrap ----------------//
$font-size-base: 17px;
@import 'bootstrap';
19 changes: 7 additions & 12 deletions docs_jekyll_uswds/schemas/_oscal-catalog/oscal-catalog.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
---
title: oscal-catalog schema documentation
description: oscal-catalog schema documentation
permalink: /docs/schemaref/oscal-catalog/
layout: post
schema: oscal-catalog
position: 0
---
<h2 xmlns="http://www.w3.org/1999/xhtml" class="title">OSCAL Control Catalog Format: Schema Reference</h2><p xmlns="http://www.w3.org/1999/xhtml">The short name (file identifier) for this schema shall be <i>oscal-catalog</i>. It is used internally when an
identifier is called for, and may appear in file names of schema artifacts.</p><p xmlns="http://www.w3.org/1999/xhtml">The XML namespace for elements conformant to this schema:
<code>http://csrc.nist.gov/ns/oscal/1.0</code></p><div xmlns="http://www.w3.org/1999/xhtml" class="remarks">
--- title: oscal-catalog schema documentation description: oscal-catalog schema documentation permalink: /docs/schemaref/oscal-catalog/ layout: post schema: oscal-catalog position: 0 ---
<h2 xmlns="http://www.w3.org/1999/xhtml" class="title">OSCAL Control Catalog Format: Schema Reference</h2>
<p xmlns="http://www.w3.org/1999/xhtml">The short name (file identifier) for this schema shall be <i>oscal-catalog</i>. It is used internally when an identifier is called for, and may appear in file names of schema artifacts.</p>
<p xmlns="http://www.w3.org/1999/xhtml">The XML namespace for elements conformant to this schema:
<code>http://csrc.nist.gov/ns/oscal/1.0</code></p>
<div xmlns="http://www.w3.org/1999/xhtml" class="remarks">
<p class="p">The OSCAL Control Catalog format can be used to describe a collection of security controls and related sub-controls, along with a variety of control metadata. The root of the Control Catalog format is <a href="#catalog" class="name">catalog</a>.</p>
<p class="p">An XML Schema is provided for the OSCAL Catalog XML model.</p>
</div>
</div>
Loading

0 comments on commit 3641845

Please sign in to comment.