Merge pull request #2373 from 18F/dev

Dev --> master
18F · Mar 30, 2017 · 3fe058a · 3fe058a
2 parents 2991834 + 8c8b9f2
commit 3fe058a
Show file tree

Hide file tree

Showing 94 changed files with 1,812 additions and 1,338 deletions.
diff --git a/.bundle/config b/.bundle/config
diff --git a/Gemfile b/Gemfile
@@ -2,10 +2,11 @@ source 'https://rubygems.org'
 
 ruby '2.3.1'
 
-gem 'accesslint-ci', '0.2.6'
+gem 'accesslint-ci', '0.2.8'
 gem 'html-proofer'
 gem 'jekyll', '~> 3.3.0'
 gem 'jemoji'
+gem 'parallel'
 
 group :jekyll_plugins do
   gem 'jekyll-archives', git: 'git://github.com/jekyll/jekyll-archives.git', ref: '112c508'
@@ -14,7 +15,7 @@ group :jekyll_plugins do
   gem 'jekyll-redirect-from'
   gem 'jekyll-seo-tag'
   gem 'jekyll-sitemap'
-  gem 'jekyll_frontmatter_tests'
+  gem 'jekyll_frontmatter_tests', '~> 0.1.0'
   gem 'jekyll_pages_api'
   gem 'jekyll_pages_api_search'
   gem 'jekyll_oembed'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,7 +9,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    accesslint-ci (0.2.6)
+    accesslint-ci (0.2.8)
       rest-client (~> 2.0)
       thor (~> 0.19)
     activesupport (4.2.8)
@@ -89,7 +89,7 @@ GEM
       jekyll (~> 3.3)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    jekyll_frontmatter_tests (0.0.13)
+    jekyll_frontmatter_tests (0.1.0)
       jekyll (>= 2.0, < 4.0)
     jekyll_oembed (0.0.3)
       jekyll (~> 3)
@@ -190,7 +190,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  accesslint-ci (= 0.2.6)
+  accesslint-ci (= 0.2.8)
   capybara
   chromedriver-helper
   codeclimate-test-reporter (~> 1.0.0)
@@ -203,11 +203,12 @@ DEPENDENCIES
   jekyll-redirect-from
   jekyll-seo-tag
   jekyll-sitemap
-  jekyll_frontmatter_tests
+  jekyll_frontmatter_tests (~> 0.1.0)
   jekyll_oembed
   jekyll_pages_api
   jekyll_pages_api_search
   jemoji
+  parallel
   pry
   rack-jekyll
   rb-readline

diff --git a/README.md b/README.md
@@ -4,7 +4,11 @@
 
 This repo houses the 18F website. We use the [Draft U.S. Web Design standards](https://standards.usa.gov/) as a front end framework. The site is built and served through [the Federalist platform](https://federalist.fr.cloud.gov/).
 
-As of March 2017, we maintain a styleguide for components used across the site at 18f.gsa.gov/styleguide.
+### Style and style guide
+
+18f.gsa.gov extends the [U.S. Web Design Standards](https://standards.usa.gov/) and [18F Brand guidelines](https://pages.18f.gov/brand/) to create a style that is professional, unique, and informative. The style guide, located at [18f.gsa.gov/styleguide/](https://18f.gsa.gov/styleguide/) documents the patterns and components used to create this theme.
+
+[View style guide](https://18f.gsa.gov/styleguide/)
 
 ### History
 

diff --git a/_about/index.md b/_about/index.md
@@ -6,22 +6,14 @@ 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
+  - text: Our principles
+    permalink: /about/#our-principles
+  - text: Our team
+    permalink: /about/#our-team
+  - text: History and funding
+    permalink: /about/#history-and-funding
+  - text: For press
+    permalink: /about/#for-press
 ---
 
 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.
@@ -30,37 +22,39 @@ subnav_items:
 
 We strive to work in a modern way and use best practices on all our projects. Here's what that means to us:
 
-<div class="icon-list">
-  <figure class="icon-list-image">{% include svg/icons/respect-icon.svg %}</figure>
-  <div class="icon-list-text">
-    <p class="paragraph-bold">Respect for government workers</p>
-    <p>Civil servants have tremendous knowledge about what it takes to achieve their agency’s mission. We help clear technical and governmental hurdles to better serve the public.</p>
-  </div>
-</div>
-
-<div class="icon-list">
-  <figure class="icon-list-image">{% include svg/icons/user-centered-icon.svg %}</figure>
-  <div class="icon-list-text">
-    <p class="paragraph-bold">Human-centered design</p>
-    <p>We listen to real users to understand their needs and build things that will be useful to them — without sacrificing technical or regulatory requirements.</p>
-  </div>
-</div>
-
-<div class="icon-list">
-  <figure class="icon-list-image">{% include svg/icons/agile-icon.svg %}</figure>
-  <div class="icon-list-text">
-    <p class="paragraph-bold">Agile methods</p>
-    <p>We help you move faster and adopt new approaches that reduce risk on your projects. We pay careful attention to what succeeds, and use metrics and feedback to inform what we build.</p>
-  </div>
-</div>
-
-<div class="icon-list">
-  <figure class="icon-list-image">{% include svg/icons/open-icon.svg %}</figure>
-  <div class="icon-list-text">
-    <p class="paragraph-bold">Open technology</p>
-    <p>Our projects are designed and built in public. That means open source, open data, and open APIs. Working transparently helps us develop faster, make better decisions, provide code for many others to reuse, and keep costs low.</p>
-  </div>
-</div>
+<ul class="icon-list-wrapper">
+  <li class="icon-list">
+    <figure class="icon-list-image">{% include svg/icons/respect-icon.svg %}</figure>
+    <div class="icon-list-text">
+      <p class="p-bold">Respect for government workers</p>
+      <p>Civil servants have tremendous knowledge about what it takes to achieve their agency’s mission. We help clear technical and governmental hurdles to better serve the public.</p>
+    </div>
+  </li>
+
+  <li class="icon-list">
+    <figure class="icon-list-image">{% include svg/icons/user-centered-icon.svg %}</figure>
+    <div class="icon-list-text">
+      <p class="p-bold">Human-centered design</p>
+      <p>We listen to real users to understand their needs and build things that will be useful to them — without sacrificing technical or regulatory requirements.</p>
+    </div>
+  </li>
+
+  <li class="icon-list">
+    <figure class="icon-list-image">{% include svg/icons/agile-icon.svg %}</figure>
+    <div class="icon-list-text">
+      <p class="p-bold">Agile methods</p>
+      <p>We help you move faster and adopt new approaches that reduce risk on your projects. We pay careful attention to what succeeds, and use metrics and feedback to inform what we build.</p>
+    </div>
+  </li>
+
+  <li class="icon-list">
+    <figure class="icon-list-image">{% include svg/icons/open-icon.svg %}</figure>
+    <div class="icon-list-text">
+      <p class="p-bold">Open technology</p>
+      <p>Our projects are designed and built in public. That means open source, open data, and open APIs. Working transparently helps us develop faster, make better decisions, provide code for many others to reuse, and keep costs low.</p>
+    </div>
+  </li>
+</ul>
 
 To learn more about how we work, explore [18F guides](https://pages.18f.gov/guides/).
 

diff --git a/_config-accesslint.yml b/_config-accesslint.yml
@@ -34,10 +34,6 @@ exclude:
 - README.md
 - robots.txt
 - search-index*
-- serve
-- serve-blog
-- serve-fast
-- serve-accesslint
 - spec/
 - system-security-plan.yml
 - tags/
@@ -372,5 +368,6 @@ exclude:
 - _posts/2017-01-06-open-source-collaboration-across-agencies-to-improve-https-deployment.md
 - _posts/2017-01-10-mark-hopson-negotiating-on-americas-behalf.md
 - _posts/2017-01-11-the-best-way-to-build-big-is-to-start-small.md
+- _posts/2017-01-17-life-changing-magic-writing-release-notes.md
 ---
 
diff --git a/_config-blog.yml b/_config-blog.yml
@@ -32,10 +32,6 @@ exclude:
 - README.md
 - robots.txt
 - search-index*
-- serve
-- serve-blog
-- serve-fast
-- serve-accesslint
 - spec/
 - system-security-plan.yml
 - tests/
@@ -369,5 +365,6 @@ exclude:
 - _posts/2017-01-06-open-source-collaboration-across-agencies-to-improve-https-deployment.md
 - _posts/2017-01-10-mark-hopson-negotiating-on-americas-behalf.md
 - _posts/2017-01-11-the-best-way-to-build-big-is-to-start-small.md
+- _posts/2017-01-17-life-changing-magic-writing-release-notes.md
 ---
 
diff --git a/_config-fast-builds.yml b/_config-fast-builds.yml
@@ -39,10 +39,6 @@ exclude:
 - README.md
 - robots.txt
 - search-index*
-- serve
-- serve-blog
-- serve-fast
-- serve-accesslint
 - sitemap.xml
 - spec/
 - system-security-plan.yml

diff --git a/_config.yml b/_config.yml
@@ -8,10 +8,12 @@ federalist_url: "https://federalist.18f.gov"
 localhost: "localhost:4000"
 env: "production"
 logo: /assets/img/logos/18F-Logo-Bright-S.png
-feature_image: /assets/img/feature-background.jpg
 tag_dir: tags
 github_repo: https://github.com/18F/18f.gsa.gov/blob/master
 
+related_posts: 3
+
+
 analytics:
   google:
     code: 'UA-48605964-1' # Change this to your GSA analytics code
@@ -142,10 +144,6 @@ exclude:
 - pages/our-work.html
 - PULL_REQUEST_TEMPLATE.md
 - README.md
-- serve
-- serve-blog
-- serve-fast
-- serve-accesslint
 - spec/
 - system-security-plan.yml
 - tests/