Merge pull request #231 from usds/security-brand-update

Security, brand, GA update

.ruby-version

@@ -1 +1 @@
-2.3.1
+2.6.5

Gemfile.lock

@@ -6,8 +6,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     bourbon (4.0.2)
       sass (~> 3.3)
       thor
@@ -18,8 +18,8 @@ GEM
     colorator (1.1.0)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.5)
-    dnsruby (1.61.2)
+    concurrent-ruby (1.1.6)
+    dnsruby (1.61.3)
       addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
@@ -28,11 +28,11 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.15.4)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.12.2)
     forwardable-extended (2.6.0)
-    gemoji (3.0.0)
+    gemoji (3.0.1)
     github-pages (197)
       activesupport (= 4.2.10)
       github-pages-health-check (= 1.16.1)
@@ -84,7 +84,7 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.11.0)
+    html-pipeline (2.12.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
@@ -206,40 +206,41 @@ GEM
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
-    multipart-post (2.0.0)
+    minitest (5.14.0)
+    multipart-post (2.1.1)
     neat (1.6.0)
       bourbon (>= 3.1)
       sass (>= 3.3)
-    nokogiri (1.10.2)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
+    octokit (4.16.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     rouge (2.2.1)
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
-    rubyzip (1.2.2)
+    rubyzip (2.2.0)
     safe_yaml (1.0.5)
     sass (3.4.25)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
@@ -252,4 +253,4 @@ DEPENDENCIES
   sass (~> 3.4.22)
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

_includes/google-analytics.html

@@ -0,0 +1,11 @@
+{% comment %}
+  Global site tag (gtag.js) - Google Analytics - USDS account
+{% endcomment %}
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-132706295-2"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-132706295-2');
+</script>

_layouts/404.html

@@ -17,5 +17,6 @@
   </div>
 </div>
 <script src='{{site.baseurl}}/assets/site.js'></script>
+{% include google-analytics.html %}
 </body>
 </html>

_layouts/techfar.html

@@ -33,5 +33,6 @@
 </div>
 
 <script async id="_fed_an_js_tag" type="text/javascript" src="{{site.baseurl}}/assets/js/federated-analytics.all.min.js?agency=EOP&amp;sub-agency=USDS"></script>
+{% include google-analytics.html %}
 </body>
 </html>

assets/_sass/styles.scss

@@ -2,11 +2,18 @@
 @import "neat/neat";
 
 // Colors
-$atlantic_blue:       #323A45; // gray-dark
-$pacific_blue:        #046B99; // primary-alt-darkest
-$miami_vice_blue:     $pacific_blue; // original
-$white:               #fff;
-$black:               #323A45; // gray-dark
+$atlantic_blue:         #323A45; // gray-dark
+$pacific_blue:          #046B99; // primary-alt-darkest
+$miami_vice_blue:       $pacific_blue; // original
+$white:                 #fff;
+$black:                 #323A45; // gray-dark
+$usds-navy:             #103c68;
+$usds-navy-dark:        #122d44;
+$usds-navy-light:       #577795;
+$usds-blue-medium:      #064e96;
+$usds-blue-bright-dark: #0071bc;
+$usds-gray:             #5d5d5d;
+$usds-gray-dark:        #3f3f3f;
 
 // Fonts
 $serif:               'Merriweather', Georgia, serif;
@@ -145,7 +152,7 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
     font-family: $sans-serif;
     font-weight: 700;
     line-height: 1.5em;
-    display: inline-block;  
+    display: inline-block;
     margin-top: 40px;
     margin-right: 20px;
 
@@ -181,7 +188,7 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
 
 
   #introduction {
-    background: $atlantic_blue;
+    background: $usds-navy;
     color: $white;
     padding-bottom: 60px;
 
@@ -199,13 +206,15 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
       img {
         max-height: 100%;
         max-width: 100%;
-        width: 200px;
+        width: 150px;
       }
     }
-    
+
     #usds_logo:hover {
       background: none;
-      opacity: 0.7;
+      img{
+       opacity: 0.9;
+      }
     }
 
     .button a {
@@ -243,7 +252,7 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
     position: fixed;
     width: 100%;
     height: 0;
-    background: $atlantic_blue;
+    background: $usds-navy;
     color: $white;
     .outer_container {
       padding: 0 40px;
@@ -271,7 +280,7 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
 
     .active {
       a {
-        background: $pacific_blue;
+        background: $usds-blue-bright-dark;
         color: $white;
         text-decoration: none;
       }
@@ -291,10 +300,10 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
         font-family: $serif;
         font-weight: lighter;
         color: $white;
-        border: 1px solid $miami_vice_blue;
+        border: 1px solid $usds-blue-bright-dark;
       }
       a:hover {
-        background: $miami_vice_blue;
+        background: $usds-blue-bright-dark;
         color: $white;
         text-decoration: none;
       }
@@ -333,7 +342,7 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
     }
 
     @include media($slimmer) {
-      ul { 
+      ul {
         display: none;
       }
       #menu_icon {
@@ -349,7 +358,7 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
     visibility: visible;
     display: block;
     height: 60px;
-    
+
     @include media($mobile) {
       height: 48px;
       visibility: visible;
@@ -358,14 +367,14 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
   }
 
   #plays_index {
-    background: $pacific_blue;
+    background: $usds-blue-medium;
     padding-bottom: 60px;
     color: $white;
 
-    h2 { 
+    h2 {
       margin-bottom: 38px;
     }
-    
+
     .columns {
       -moz-column-count: 2;
       -moz-column-gap: 20px;
@@ -388,7 +397,7 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
         width: 85%;
       }
     }
-    
+
     ol, li {
       font-size: 20px;
       font-weight: 300;
@@ -400,7 +409,7 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
     li {
       padding-bottom: 20px;
     }
-    
+
     .button {
       a {
         color: white;
@@ -565,7 +574,7 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
   ol, ul {
     width: 80%;
   }
-  
+
   ol {
     list-style-type: square;
   }
@@ -591,4 +600,3 @@ $slimmer: new-breakpoint(min-width 641px max-width 980px 12);
     display: none;
   }
 }
-

index.html

@@ -35,7 +35,7 @@
 <div id="introduction">
   <div class="outer_container">
     <div class="inner_container">
-      <a id="usds_logo" href="https://www.usds.gov" title="Link to the United States Digital Service"><img src='{{site.baseurl}}/assets/images/USDS-logo-rays-transparent.png' alt="Logo of the United States Digital Service"></a>
+      <a id="usds_logo" href="https://www.usds.gov" target="_blank" title="Link to the United States Digital Service"><img src='{{site.baseurl}}/assets/images/usds-logo-seal.png' alt="Logo of the United States Digital Service"></a>
       {% capture introduction %}{% include introduction.md %}{% endcapture %}
       {{ introduction | markdownify }}
       <div class="button">
@@ -83,5 +83,6 @@ <h2 class="display">{{ play.title }}</h2>
 <script src='{{site.baseurl}}/assets/js/scrollspy.js'></script>
 <script src='{{site.baseurl}}/assets/js/site.js'></script>
 <script async id="_fed_an_js_tag" type="text/javascript" src="{{site.baseurl}}/assets/js/federated-analytics.all.min.js?agency=EOP&amp;sub-agency=USDS"></script>
+{% include google-analytics.html %}
 </body>
 </html>