Merge pull request #655 from cfpb/refresh-header-footer

Change to cfgov-refresh header and footer

.travis.yml

@@ -3,6 +3,7 @@ node_js:
   - iojs
 
 install:
+  - npm install -g npm
   - npm install -g grunt-cli
   - ./frontendbuild.sh
 

Gruntfile.js

@@ -277,6 +277,17 @@ module.exports = function(grunt) {
       dist: {
         files:
         [
+          {
+            expand: true,
+            cwd: 'node_modules/cfgov-sheer-templates',
+            src: [
+              // Template files
+              "_*/*",
+              // Head scripts
+              "static/js/*"
+            ],
+            dest: 'dist/'
+          },
           {
             expand: true,
             cwd: 'src',
@@ -293,6 +304,17 @@ module.exports = function(grunt) {
       release: {
         files:
         [
+          {
+            expand: true,
+            cwd: 'node_modules/cfgov-sheer-templates',
+            src: [
+              // Template files
+              "_*/*",
+              // Head scripts
+              "static/js/*"
+            ],
+            dest: 'dist/'
+          },
           {
             expand: true,
             cwd: 'src',
@@ -402,7 +424,7 @@ module.exports = function(grunt) {
           harmony: true,
           coverageFolder: 'test/coverage',
           coverage: true,
-          excludes: ['src/static/vendor/**/*', 'src/static/js/modules/prepare-worksheets/**/*'],          
+          excludes: ['src/static/vendor/**/*', 'src/static/js/modules/prepare-worksheets/**/*'],
           reportFormats: ['cobertura','lcov'],
           check: {
             lines: 50,

package.json

@@ -59,6 +59,7 @@
     "grunt-string-replace": "latest",
     "grunt-usemin": "~2.4.0",
     "istanbul": "^0.3.5",
+    "jsdom": "4.2.0",
     "load-grunt-config": "^0.13.1",
     "load-grunt-tasks": "^0.6.0",
     "mocha": "^1.18.2",
@@ -76,8 +77,9 @@
   "keywords": [],
   "dependencies": {
     "amortize": "0.2.2",
-    "debounce": "0.0.3",
+    "cfgov-sheer-templates": "^2.0.1",
     "date-format": "0.0.2",
+    "debounce": "0.0.3",
     "foreach": "2.0.4",
     "format-usd": "^0.2.0",
     "fuzzy-state-search": "0.1.0",

src/_layouts/base.html

@@ -42,17 +42,19 @@
     <script src="{{ url_for('static', filename='js/lte-ie8.js') }}"></script>
 <![endif]-->
 
-    <script>
-        // Confirm availability of JS and remove no-js class from html
-        var docElement = document.documentElement;
-        docElement.className = docElement.className.replace(/(^|\s)no-js(\s|$)/, '$1$2');
-
-        // H5BP's Asynchronous Google Analytics snippet.
-        var _gaq=[['_setAccount','UA-20466645-3'],['_setDomainName', '.consumerfinance.gov'],['_trackPageview']];
-        (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
-        g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
-        s.parentNode.insertBefore(g,s)}(document,'script'));
-    </script>
+{# Customized Modernizr build that includes html5shiv.
+   Built via gulp-modernizer in the cfgov-refresh `scripts.js` task. #}
+<script src="{{ static('js/modernizr.min.js') }}"></script>
+
+<!--[if lt IE 9]>
+<script>
+    // If in IE8 reverse no-js/js class change made by modernizr.
+    var docElement = document.documentElement;
+    docElement.className = docElement.className.replace( /(^|\s)js(\s|$)/, '$1no-js$2' );
+</script>
+<![endif]-->
+
+<!--[if IE 9]><script src="{{ static('js/ie/common.ie.js') }}"></script><![endif]-->
 
 </head>
 
@@ -67,7 +69,7 @@
       })(window,document,'script','dataLayer','GTM-KMMLRS');</script>
     <!-- End Google Tag Manager -->
 
-{% include "nemo_header.html" %}
+{% include "header.html" %}
 
   <!-- PRIMARY CONTENT -->
   <div id="primary-content" tabindex="0">
@@ -78,8 +80,7 @@
   <!-- /PRIMARY CONTENT -->
 
 
-{% include "nemo_subnav.html" %}
-{% include "nemo_footer.html" %}
+{% include "footer.html" %}
 
 <!-- Common js -->
 <script src="{{ url_for('static', filename='js/main.js') }}?v5"></script>

src/static/css/main.less

@@ -15,12 +15,9 @@
 // Override the Capital Framework theme variables with colors from the brand color palette.
 @import (less) "cf-theme-overrides.less";
 
-// import CFPB nemo theme header and footer styles
-.nemo {
-  @import "module/nemo.less";
-  // and a shim to override some things
-  @import "module/nemo-shim.less";
-}
+// import cfgov-refresh header and footer styles
+@import (inline) "../../../node_modules/cfgov-sheer-templates/static/css/header.css";
+@import (inline) "../../../node_modules/cfgov-sheer-templates/static/css/footer.css";
 
 @import "module/bootstrap-tooltips.less";
 @import "../../vendor/bootstrap/tooltip.less";