Merging Staging to Master

Author: Scott Weber

CONTRIBUTING.md

@@ -3,9 +3,5 @@ source 'https://rubygems.org'
 gem 'jekyll'
 gem 'redcarpet'
 gem 'rouge'
-gem 'go_script'
-gem 'jekyll-redirect-from'
-
-group :jekyll_plugins do
-  gem 'guides_style_18f'
-end
+gem 'hash-joiner'
+gem 'jekyll-last-modified-at'

Gemfile

@@ -1,63 +1,58 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    colorator (0.1)
-    ffi (1.9.10)
-    go_script (0.1.9)
-      bundler (~> 1.10)
-      safe_yaml (~> 1.0)
-    guides_style_18f (0.4.8)
-      jekyll
-      jekyll_pages_api
-      jekyll_pages_api_search
-      rouge
-      sass
-    htmlentities (4.3.4)
-    jekyll (3.1.6)
-      colorator (~> 0.1)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    colorator (1.1.0)
+    ffi (1.9.18)
+    forwardable-extended (2.6.0)
+    hash-joiner (0.0.7)
+      safe_yaml
+    jekyll (3.4.3)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
       liquid (~> 3.0)
       mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
-    jekyll-redirect-from (0.11.0)
-      jekyll (>= 2.0)
-    jekyll-sass-converter (1.4.0)
+    jekyll-last-modified-at (1.0.1)
+      jekyll (~> 3.3)
+      posix-spawn (~> 0.3.9)
+    jekyll-sass-converter (1.5.0)
       sass (~> 3.4)
-    jekyll-watch (1.4.0)
+    jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    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)
-    kramdown (1.11.1)
+    kramdown (1.13.2)
     liquid (3.0.6)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    posix-spawn (0.3.13)
+    public_suffix (2.0.5)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    redcarpet (3.3.4)
+    redcarpet (3.4.0)
     rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.4.22)
+    sass (3.4.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  go_script
-  guides_style_18f
+  hash-joiner
   jekyll
-  jekyll-redirect-from
+  jekyll-last-modified-at
   redcarpet
   rouge
 
 BUNDLED WITH
-   1.12.5
+   1.14.2

Gemfile.lock

@@ -9,163 +9,37 @@ exclude:
 - go
 - vendor
 
-gems:
-  - jekyll-redirect-from
-
 permalink: pretty
 highlighter: rouge
 
 sass:
-  style: :compressed
+  style: compressed
 
 collections:
   pages:
     output: true
     permalink: /:path/
+  methods:
+    output: true
+    permalink: /:path/
+site:
+  title: Methods
 
-# Author/Organization info to be displayed in the templates
-author:
-  name: 18F
-  url: https://18f.gsa.gov
-
-# Point the logo URL at a file in your repo or hosted elsewhere by your organization
-logourl: /assets/img/18F-Logo-2016-Black.svg
-logoalt: 18F logo
-
-# Navigation
-# List links that should appear in the site sidebar here
-navigation:
-- text: Introduction
-  url: index.html
-  internal: true
-- text: Discover
-  url: discover/
-  internal: true
-  children:
-  - text: Feature dot voting
-    url: feature-dot-voting/
-    internal: true
-  - text: KJ method
-    url: kj-method/
-    internal: true
-  - text: Metrics definition
-    url: metrics-definition/
-    internal: true
-  - text: Design studio
-    url: design-studio/
-    internal: true
-  - text: Bodystorming
-    url: bodystorming/
-    internal: true
-  - text: Cognitive walkthrough
-    url: cognitive-walkthrough/
-    internal: true
-  - text: Contextual inquiry
-    url: contextual-inquiry/
-    internal: true
-  - text: Heuristic analysis
-    url: heuristic-analysis/
-    internal: true
-  - text: Stakeholder and user interviews
-    url: stakeholder-and-user-interviews/
-    internal: true
-- text: Decide
-  url: decide/
-  internal: true
-  children:
-  - text: Comparative analysis
-    url: comparative-analysis/
-    internal: true
-  - text: Content audit
-    url: content-audit/
-    internal: true
-  - text: Design principles
-    url: design-principles/
-    internal: true
-  - text: Site mapping
-    url: site-mapping/
-    internal: true
-  - text: Task flow analysis
-    url: task-flow-analysis/
-    internal: true
-  - text: User scenarios
-    url: user-scenarios/
-    internal: true
-  - text: Affinity diagramming
-    url: affinity-diagramming/
-    internal: true
-  - text: Journey mapping
-    url: journey-mapping/
-    internal: true
-  - text: Mental modeling
-    url: mental-modeling/
-    internal: true
-  - text: Personas
-    url: personas/
-    internal: true
-  - text: Storyboarding
-    url: storyboarding/
-    internal: true
-  - text: Style tiles
-    url: style-tiles/
-    internal: true
-- text: Make
-  url: make/
-  internal: true
-  children:
-  - text: Wireframing
-    url: wireframing/
-    internal: true
-  - text: Design pattern library
-    url: design-pattern-library/
-    internal: true
-  - text: Prototyping
-    url: prototyping/
-    internal: true
-- text: Validate
-  url: validate/
-  internal: true
-  children:
-  - text: Card sorting
-    url: card-sorting/
-    internal: true
-  - text: Multivariate testing
-    url: multivariate-testing/
-    internal: true
-  - text: Usability testing
-    url: usability-testing/
-    internal: true
-  - text: Visual preference testing
-    url: visual-preference-testing/
-    internal: true
-- text: Fundamentals
-  url: fundamentals/
-  internal: true
-  children:
-  - text: Incentives
-    url: incentives/
-    internal: true
-  - text: Privacy
-    url: privacy/
-    internal: true
-  - text: Recruiting
-    url: recruiting/
-    internal: true
+description: 18F’s method cards describe how our organization puts human-centered design into practice.
 
 repos:
 - name: Methods
   description: Main repository
   url: https://github.com/18F/methods
 
-brand_color: '#1188ff'
-
-google_analytics_ua: UA-48605964-19
+jekyll_get:
+  - data: releases
+    json: 'https://api.github.com/repos/18F/web-design-standards/releases'
 
-back_link:
-  url: "https://pages.18f.gov/guides/"
-  text: Read more 18F Guides
+gems:
+  - jekyll-last-modified-at
 
-styles:
+google_analytics_ua: UA-48605964-19
 
 defaults:
   -

LICENSE.md

@@ -0,0 +1,9 @@
+{% assign discover_methods     = (site.methods | where: "category", "Discover" ) %}
+{% assign decide_methods       = (site.methods | where: "category", "Decide" )   %}
+{% assign make_methods         = (site.methods | where: "category", "Make" )     %}
+{% assign validate_methods     = (site.methods | where: "category", "Validate" ) %}
+{% assign fundamentals_methods = (site.methods | where: "category", "Fundamentals" ) %}
+{% assign category_methods     = (site.methods | where: "category", page.title ) %}
+
+<! -- This is used for setting category variables -->
+{% capture var-category-name %}{{ page.category | downcase }}_methods{% endcapture %}

README.md

@@ -0,0 +1,61 @@
+
+
+<section class="category category--discover usa-section" id="discover">
+<div class="usa-grid">
+      <header class="category--header">
+          <h1 class="category--title">Discover</h1>
+          <p class="category--subtitle">Methods to build empathy for the project and people involved.</p>
+      </header>
+      {% for method in discover_methods %}
+        {% include method.html method=method %}
+      {% endfor %}
+    </div>
+  </section>
+
+
+
+
+  <section class="category category--decide usa-section" id="decide">
+<div class="usa-grid">
+      <header class="category--header">
+          <h1 class="category--title">Decide</h1>
+          <p class="category--subtitle">Methods for focusing the design effort.</p>
+      </header>
+      {% for method in decide_methods %}
+        {% include method.html method=method %}
+      {% endfor %}
+    </div>
+  </section>
+  <section class="category category--make usa-section" id="make">
+<div class="usa-grid">
+      <header class="category--header">
+          <h1 class="category--title">Make</h1>
+          <p class="category--subtitle">Methods for creating a testable solution.</p>
+      </header>
+      {% for method in make_methods %}
+        {% include method.html method=method %}
+      {% endfor %}
+    </div>
+  </section>
+  <section class="category category--validate usa-section" id="validate">
+<div class="usa-grid">
+      <header class="category--header">
+          <h1 class="category--title">Validate</h1>
+          <p class="category--subtitle">Methods for testing a design hypothesis.</p>
+      </header>
+      {% for method in validate_methods %}
+        {% include method.html method=method %}
+      {% endfor %}
+    </div>
+  </section>
+  <section class="category category--fundamentals usa-section" id="fundamentals">
+<div class="usa-grid">
+      <header class="category--header">
+          <h1 class="category--title">Fundamentals</h1>
+          <p class="category--subtitle">Foundational methods for practicing design research.</p>
+      </header>
+      {% for method in fundamentals_methods %}
+        {% include method.html method=method %}
+      {% endfor %}
+    </div>
+  </section>

Staticfile

@@ -1,8 +1,23 @@
-<footer role="contentinfo">
-  <div class="wrap">
-    <p>This project is maintained by <a href="{{ site.author.url }}">{{ site.author.name }}</a>.</p>
-    <p>To share your feedback with us, open an issue or pull request on our <a href="https://github.com/18F/methods">GitHub repository.</a></p>
-    <p>Hosted on <a href="https://github.com/18F/pages/">18F Pages</a>.</p>
-    The <a href="https://github.com/18F/guides-template/">18F Guides theme</a> is based on <a href="https://github.com/cfpb/docter/">DOCter</a> from <a href="http://cfpb.github.io/">CFPB</a>.</p>
-  </div><!--/.wrap -->
+<div class="usa-overlay"></div>
+<footer class="site-footer no-print">
+    <div class="usa-grid">
+        <p>This project is maintained by <a href="https://18f.gsa.gov">18F</a>.</p>
+        <p>To share your feedback with us, open an issue or pull request on our <a href="https://github.com/18F/methods">GitHub repository.</a></p>
+    </div>
 </footer>
+<!-- Google Analytics -->
+<script>
+(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', 'UA-48605964-19', 'auto');
+
+// anonymize user IPs (chops off the last IP triplet)
+ga('set', 'anonymizeIp', true);
+ga('set', 'forceSSL', true);
+ga('send', 'pageview');
+</script>
+
+<!-- Digital Analytics Program roll-up, see https://analytics.usa.gov for data -->
+<script id="_fed_an_ua_tag" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA"></script>