Merge branch 'ticket484-NIST-CSS-changed' into develop

usnistgov · Dec 7, 2012 · a11c4b0 · a11c4b0
2 parents c27c0a1 + fbda0c9
commit a11c4b0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/documentation/_themes/nist/layout.html b/documentation/_themes/nist/layout.html
@@ -176,16 +176,11 @@
 
             </div>
     </div>
-    </div>
-    <div class="mml">
 {{ super() }}
-    </div>
 {% endblock %}
 {% block relbar2 %}{% endblock %}
 {% block document %}
-    <div class="mml">
     {{ super() }}
-    </div>
 {% endblock %}
 {% block sidebarlogo %}
 <!-- AddThis Button BEGIN -->
@@ -197,21 +192,22 @@
 {% endblock %}
 {% block footer %}
     <div class="footer mml">
-    <p>The National Institute of Standards and Technology (NIST) is an agency of the U.S. Commerce Department.</p>
+    <p>The National Institute of Standards and Technology (NIST) is an agency of the <a href="http://www.commerce.gov"> U.S. Department of Commerce</a>
     <p>
-    <a href="http://www.nist.gov/public_affairs/privacy.cfm">Privacy policy / security notice / accessibility statement</a> / 
+    <a href="http://www.nist.gov/public_affairs/privacy.cfm">Privacy Policy / Security Notice / Accessibility Statement</a> / 
     <a href="http://www.nist.gov/public_affairs/disclaim.cfm">Disclaimer</a> / 
-    <a href="http://www.nist.gov/admin/foia/">Freedom of Information Act (FOIA)</a> / 
+    <a href="http://www.nist.gov/admin/foia/">Freedom of Information Act (FOIA)</a> / <br />
+    <a href="http://www.nist.gov/public_affairs/envpolicy.cfm">Environmental Policy Statement</a> /
+
     <a href="http://www.nist.gov/director/civil/nofearpolicy.cfm">No Fear Act Policy</a> /
-    <br />
-
-    <a href="http://www.ExpectMore.gov">ExpectMore.gov (performance of federal programs)</a> / 
-    <a href="http://www.nist.gov/director/quality_standards.cfm">NIST Information Quality Standards</a>
+    <a href="http://www.nist.gov/director/quality_standards.cfm">NIST Information Quality Standards</a> / <br />
+    <a href="http://www.nist.gov/director/scientific_integrity_summary.cfm">Scientific Integrity Summary</a>
     </p>
     <p>
     Last updated: {{ last_updated|e }} |
     Contact: <a href="mailto:webmaster@ctcms.nist.gov" class="bold"> <span class="all-caps">Ctcms</span> Webmaster</a>
     </p>
     </div>
+    </div> <!-- id="base-template-wrapper" class="mml" --> 
 </div>
 {% endblock %}
diff --git a/documentation/_themes/nist/static/nist.css b/documentation/_themes/nist/static/nist.css
@@ -15,6 +15,11 @@
 
 /* -- page layout ----------------------------------------------------------- */
 
+#body-dummy {
+    margin: -8px;
+    padding: 0px;
+}
+
 div.bodywrapper {
     margin: 0 240px 0 0;
     border-right: 1px solid #ccc;