Merge pull request #2318 from 18F/dev

Dev --> master

.eslintignore

@@ -1 +1,2 @@
 assets/js/**/*.min.js
+assets/js/lib/

Gemfile

@@ -17,6 +17,7 @@ group :jekyll_plugins do
   gem 'jekyll_frontmatter_tests'
   gem 'jekyll_pages_api'
   gem 'jekyll_pages_api_search'
+  gem 'jekyll_oembed'
 end
 
 group :development do

Gemfile.lock

@@ -12,43 +12,42 @@ GEM
     accesslint-ci (0.2.6)
       rest-client (~> 2.0)
       thor (~> 0.19)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     archive-zip (0.7.0)
       io-like (~> 0.3.0)
-    capybara (2.11.0)
+    capybara (2.12.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.9)
+    childprocess (0.6.1)
       ffi (~> 1.0, >= 1.0.11)
     chromedriver-helper (1.0.0)
       archive-zip (~> 0.7.0)
       nokogiri (~> 1.6)
-    codeclimate-test-reporter (1.0.5)
+    codeclimate-test-reporter (1.0.6)
       simplecov
     coderay (1.1.1)
     colorator (1.1.0)
     colored (1.2)
     colorize (0.8.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    domain_name (0.5.20161129)
+    domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
     ethon (0.10.1)
       ffi (>= 1.3.0)
     ffi (1.9.17)
     forwardable-extended (2.6.0)
-    gemoji (2.1.0)
+    gemoji (3.0.0)
     html-pipeline (2.5.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
@@ -64,7 +63,7 @@ GEM
     htmlentities (4.3.4)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.7.0)
+    i18n (0.8.1)
     io-like (0.3.0)
     jekyll (3.3.1)
       addressable (~> 2.4)
@@ -77,7 +76,7 @@ GEM
       pathutil (~> 0.9)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
-    jekyll-feed (0.8.0)
+    jekyll-feed (0.9.1)
       jekyll (~> 3.3)
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.12.1)
@@ -92,18 +91,21 @@ GEM
       listen (~> 3.0, < 3.1)
     jekyll_frontmatter_tests (0.0.13)
       jekyll (>= 2.0, < 4.0)
+    jekyll_oembed (0.0.3)
+      jekyll (~> 3)
+      ruby-oembed (~> 0)
     jekyll_pages_api (0.1.6)
       htmlentities (~> 4.3)
       jekyll (>= 2.0, < 4.0)
     jekyll_pages_api_search (0.4.4)
       jekyll_pages_api (~> 0.1.4)
       sass (~> 3.4)
-    jemoji (0.7.0)
+    jemoji (0.8.0)
       activesupport (~> 4.0)
-      gemoji (~> 2.0)
+      gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0)
-    json (1.8.6)
+    json (2.0.3)
     kramdown (1.13.2)
     liquid (3.0.6)
     listen (3.0.8)
@@ -135,10 +137,10 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rb-readline (0.5.3)
-    rest-client (2.0.0)
+    rb-readline (0.5.4)
+    rest-client (2.0.1)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -156,29 +158,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubyzip (1.2.0)
+    ruby-oembed (0.10.1)
+    rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sass (3.4.23)
-    selenium-webdriver (3.0.5)
+    selenium-webdriver (3.1.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
     thor (0.19.4)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    websocket (1.2.3)
+    websocket (1.2.4)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yell (2.0.7)
@@ -201,6 +204,7 @@ DEPENDENCIES
   jekyll-seo-tag
   jekyll-sitemap
   jekyll_frontmatter_tests
+  jekyll_oembed
   jekyll_pages_api
   jekyll_pages_api_search
   jemoji

_about/index.md

@@ -5,11 +5,26 @@ permalink: /about/
 layout: default-intro
 lead: We help other government agencies build, buy, and share technology products.
 banner_cta: true
+subnav_items:
+-
+  text: Our principles
+  permalink: /about/#our-principles
+  in_subnav: true
+-
+  text: Our team
+  permalink: /about/#our-team
+  in_subnav: true
+-
+  text: History and funding
+  permalink: /about/#history-and-funding
+  in_subnav: true
+-
+  text: For press
+  permalink: /about/#for-press
+  in_subnav: true
 ---
 
-18F is an office within the [General Services Administration](https://www.gsa.gov/) (GSA).
-
-We've worked with over 50 offices and agencies, on more than 200 engagements. All our projects support agencies in transforming how they deliver digital services and technology products.
+18F is an office within the [General Services Administration](https://www.gsa.gov/) (GSA) that collaborates with other agencies to fix technical problems, build products, and improve how government serves the public through technology.
 
 ## Our principles
 

_authors/jameshupp.md

@@ -4,6 +4,6 @@ full_name: James Hupp
 first_name: James
 last_name: Hupp
 redirect_from: "/team/jameshupp/"
-published: false
+published: true
 ---
 

_config.yml

@@ -46,9 +46,9 @@ collections:
   projects:
     output: true
     permalink: /what-we-deliver/:path/
-  hire:
+  contact:
     output: false
-    permalink: /hire/:path/
+    permalink: /contact/:path/
   styleguide:
     output: true
     permalink: /styleguide/:path/
@@ -71,11 +71,11 @@ defaults:
     layout: default-profile
  -
   scope:
-    path: "_hire"
+    path: "_contact"
   values:
     layout: default-intro
     # include_subnav: true
-    subnav_anchor: /hire/
+    subnav_anchor: /contact/
  -
   scope:
     path: "_about"
@@ -90,6 +90,8 @@ defaults:
     layout: default-intro
     include_subnav: true
     subnav_anchor: /join/
+    parent_title: Join 18F
+    parent_permalink: /join/
  -
   scope:
     path: "_styleguide"

_hire/index.md → _contact/index.md

@@ -1,6 +1,6 @@
 ---
 title: Hire 18F
-permalink: /hire/
+permalink: /contact/
 layout: default-intro
 lead: Let’s work together to design services that empower your team, better serve the public, and tackle the big problems facing your agency.
 ---

_hire/partnership-playbook/getting-started.md → _contact/partnership-playbook/getting-started.md

@@ -1,5 +1,5 @@
 ---
-permalink: /hire/partnership-playbook/getting-started/
+permalink: /contact/partnership-playbook/getting-started/
 title: 4. Getting started
 ---
 

_hire/partnership-playbook/how-we-work.md → _contact/partnership-playbook/how-we-work.md

@@ -1,5 +1,5 @@
 ---
-permalink: /hire/partnership-playbook/how-we-work/
+permalink: /contact/partnership-playbook/how-we-work/
 title: 2. How we work
 ---
 

_hire/partnership-playbook/index.md → _contact/partnership-playbook/index.md

@@ -1,17 +1,17 @@
 ---
 title: Partnership Playbook
-permalink: /hire/partnership-playbook/
+permalink: /contact/partnership-playbook/
 lead: Let’s work together to design services that empower your team, better serve the public, and tackle the big problems facing your agency.
 ---
 
 This guide will help you, as an agency, understand what it’s like to work with the 18F team. You'll learn what to expect and get a sense of the challenges you may face when working with a digital service team, which will likely be a significantly different experience than working with a contractor. Many of the principles below build on specific plays in the [U.S. Digital Services Playbook](https://playbook.cio.gov), which some 18F staffers assisted in authoring.
 
 The principles we use in working together are:
 
->1. [We build in the open.]({{ site.baseurl }}/hire/partnership-playbook/we-build-in-the-open/)
-2. [How we work.]({{ site.baseurl }}/hire/partnership-playbook/how-we-work/)
-3. [Who we work with.]({{ site.baseurl }}/hire/partnership-playbook/who-we-work-with/)
-4. [Getting started.]({{ site.baseurl }}/hire/partnership-playbook/getting-started/)
-5. [What to expect.]({{ site.baseurl }}/hire/partnership-playbook/what-to-expect/)
+>1. [We build in the open.]({{ site.baseurl }}/contact/partnership-playbook/we-build-in-the-open/)
+2. [How we work.]({{ site.baseurl }}/contact/partnership-playbook/how-we-work/)
+3. [Who we work with.]({{ site.baseurl }}/contact/partnership-playbook/who-we-work-with/)
+4. [Getting started.]({{ site.baseurl }}/contact/partnership-playbook/getting-started/)
+5. [What to expect.]({{ site.baseurl }}/contact/partnership-playbook/what-to-expect/)
 
 We’ll explain what each principle will mean to you as our partner. We also provide a set of prompting questions in the “How do you know if you’re ready” sections, which you can use with stakeholders to assess potential conflict points that may need to be resolved before we partner.

_hire/partnership-playbook/we-build-in-the-open.md → _contact/partnership-playbook/we-build-in-the-open.md

@@ -1,5 +1,5 @@
 ---
-permalink: /hire/partnership-playbook/we-build-in-the-open/
+permalink: /contact/partnership-playbook/we-build-in-the-open/
 title: 1. We build in the open
 ---
 

_hire/partnership-playbook/what-to-expect.md → _contact/partnership-playbook/what-to-expect.md

@@ -1,5 +1,5 @@
 ---
-permalink: /hire/partnership-playbook/what-to-expect/
+permalink: /contact/partnership-playbook/what-to-expect/
 title: 5. What to expect
 ---
 

_hire/partnership-playbook/who-we-work-with.md → _contact/partnership-playbook/who-we-work-with.md

@@ -1,5 +1,5 @@
 ---
-permalink: /hire/partnership-playbook/who-we-work-with/
+permalink: /contact/partnership-playbook/who-we-work-with/
 title: 3. Who we work with
 ---