Merge pull request #2453 from 18F/staging

Release to production

Gemfile

@@ -1,4 +1,4 @@
-# A sample Gemfile
+
 source "https://rubygems.org"
 
 raise 'Need ruby > 2.1 to run' unless RUBY_VERSION.to_f > 2.1

_includes/google_analytics.html

@@ -1,18 +1,21 @@
 <!-- Digital Analytics Program roll-up, see the data at https://analytics.usa.gov -->
 <script src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js" id="_fed_an_ua_tag"></script>
-
+
+{% assign ga_id = site.google_analytics[site.branch]|default:site.google_analytics.default %}
+{% if ga_id %}
 <script>
   // Google Analytics
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-  ga('create', '{{ include.id }}', 'auto');
+  ga('create', '{{ ga_id }}', 'auto');
   ga('set', 'anonymizeIp', true);
   ga('set', 'forceSSL', true);
   ga('send', 'pageview');
 </script>
+{% endif %}
 
 <!-- Google Tag Manager -->
 <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':

_sass/_variables.scss

@@ -1,7 +1,7 @@
 @import 'lib/font-awesome/font-awesome/variables';
 
 // Logos
-$eiti-logo-width: 250px;
+$nrrd-logo-width: 220px;
 
 // Typography
 $weight-light: 300; // (Lato Light) use

_sass/blocks/_header.scss

@@ -25,7 +25,7 @@
 
 header,
 .header {
-  margin-top: $base-padding-base;
+  margin-top: $base-padding;
 }
 
 .header-image_link {
@@ -38,22 +38,22 @@ header,
 
 .header-image {
   max-width: 316px;
-  width: $eiti-logo-width;
+  width: $nrrd-logo-width;
 
   @include respond-to(medium-up) {
     width: auto;
   }
 }
 
 .header-left {
-   @include span-columns(6);
-   margin-bottom: $base-padding;
-
-   @include respond-to(medium-up) {
-      @include span-columns(3);
-      margin-bottom: 0;
-      margin-top: 2rem;
-   }
+  @include span-columns(6);
+  margin-bottom: $base-padding-base;
+
+  @include respond-to(medium-up) {
+    @include span-columns(3);
+    margin-bottom: 0;
+    margin-top: 2rem;
+ }
 }
 
 .header-right {

pages/404.md

@@ -8,9 +8,9 @@ subtitle: Page not found
 
 <script>
 (function(){
-var redirectMessage = function( oldPath, newPath, pathname, remainingDelay ) {
+var redirectMessage = function( newPath, pathname, remainingDelay ) {
 	return (
-		'No page found at <a href="' + oldPath.href + '">' + oldPath.pathname + '</a>.<br />' +
+		'No page found.<br />' +
 		'Automatically redirecting to <a href="' + newPath + '">' + pathname + '</a> ' +
 		'in ' + remainingDelay + ' seconds.'
 	);
@@ -40,7 +40,7 @@ var countDown = function( seconds ) {
 		document.location.replace( nextLocation );
 	}
 
-	additionalMessage.innerHTML = redirectMessage( path, nextLocation, parentPath || '/', seconds );
+	additionalMessage.innerHTML = redirectMessage( nextLocation, parentPath || '/', seconds );
 	setTimeout( countDown.bind( this, seconds - 1 ), 1000 );
 }