Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev --> master #2373

Merged
merged 12 commits into from
Mar 30, 2017
Merged
3 changes: 0 additions & 3 deletions .bundle/config

This file was deleted.

3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -208,6 +208,7 @@ DEPENDENCIES
jekyll_pages_api
jekyll_pages_api_search
jemoji
parallel
pry
rack-jekyll
rb-readline
Expand Down
64 changes: 33 additions & 31 deletions _about/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,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/).

Expand Down
5 changes: 1 addition & 4 deletions _config-accesslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ exclude:
- README.md
- robots.txt
- search-index*
- serve
- serve-blog
- serve-fast
- serve-accesslint
- spec/
- system-security-plan.yml
- tags/
Expand Down Expand Up @@ -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
---

5 changes: 1 addition & 4 deletions _config-blog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ exclude:
- README.md
- robots.txt
- search-index*
- serve
- serve-blog
- serve-fast
- serve-accesslint
- spec/
- system-security-plan.yml
- tests/
Expand Down Expand Up @@ -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
---

4 changes: 0 additions & 4 deletions _config-fast-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down
9 changes: 9 additions & 0 deletions _includes/breadcrumb.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% assign parent_title = include.parent_title | default: page.parent_title %}
{% assign parent_permalink = include.parent_permalink | default: page.parent_permalink %}
{% assign page_title = include.page_title | default: page.title %}
{% assign background_class = include.background_class %}
<section {% if background_class %}class="background-gray"{% endif %}>
<div class="breadcrumb usa-grid">
<a class="link-arrow-right" href="{{ site.baseurl }}/">Home</a> {% include svg/icons/arrow-right.svg %} <a class="link-arrow-right" href="{{ site.baseurl }}{{ parent_permalink }}">{{ parent_title }}</a> {% include svg/icons/arrow-right.svg %} <span class="link-arrow-right">{{ page_title }}</span>
</div>
</section>
32 changes: 18 additions & 14 deletions _includes/details-code.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,40 @@


<ul class="usa-accordion styleguide-details">
{% if include.uswds_ref or include.scss_ref or include.other_ref or include.description or include.image %}
{% if include.content %}
<li>
<button class="usa-accordion-button" aria-controls="{{ include.title | slugify }}">
{{ include.text | default: 'Code' }}
</button>
<div id="{{ include.title | slugify }}" class="usa-accordion-content styleguide-border">
{{ code | markdownify }}
</div>
</li>
{% endif %}
{% if include.include_ref or include.uswds_ref or include.scss_ref or include.other_ref or include.description or include.image %}
<li>
<button class="usa-accordion-button"
aria-expanded="true" aria-controls="{{ include.title | slugify | append: '-details' }}">
Usage details
Documentation
</button>
<div id="{{ include.title | slugify | append: '-details' }}" class="usa-accordion-content styleguide-border">
{% if include.description %}
<p>{{ include.description | markdownify }}</p>
{% endif %}
{% if include.uswds_ref or include.scss_ref or include.other_ref %}
{% if include.include_ref or include.uswds_ref or include.scss_ref or include.other_ref %}
<p>Additional resources:</p>
<ul>
{% if include.include_ref %}
<li><a href="{{ include.include_ref }}">Include reference</a></li>
{% endif %}
{% if include.uswds_ref %}
<li><a href="{{ include.uswds_ref }}">USWDS references</a></li>
{% endif %}
{% if include.scss_ref %}
<li><a href="{{ include.scss_ref }}">SCSS references</a></li>
{% endif %}
{% if include.other_ref %}
<li><a href="{{ include.other_ref }}">Documentation</a></li>
<li><a href="{{ include.other_ref }}">Additional documentation</a></li>
{% endif %}
</ul>
{% endif %}
Expand All @@ -44,14 +58,4 @@
</div>
</li>
{% endif %}
{% if include.content %}
<li>
<button class="usa-accordion-button" aria-controls="{{ include.title | slugify }}">
{{ include.text | default: 'Code' }}
</button>
<div id="{{ include.title | slugify }}" class="usa-accordion-content styleguide-border">
{{ code | markdownify }}
</div>
</li>
{% endif %}
</ul>
4 changes: 0 additions & 4 deletions _includes/details.html

This file was deleted.

15 changes: 7 additions & 8 deletions _includes/feature-image.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
{% assign include_figcaption = include.image_figcaption | default: page.image_figcaption %}

{% if include_image %}
{% unless page.hero == false %}
<figure class="post-feature_image" role="img" title="{{ include_image_alt }}" style="background-image: url('{{ site.baseurl }}{{ include_image }}')">
{% if include_figcaption %}
<figcaption>{{ include_figcaption }}</figcaption>

{% endif %}
</figure>
{% endunless %}
{% unless page.hero == false %}
<figure class="post-feature_image" role="img" title="{{ include_image_alt }}" style="background-image: url('{{ site.baseurl }}{{ include_image }}')">
{% if include_figcaption %}
<figcaption>{{ include_figcaption }}</figcaption>
{% endif %}
</figure>
{% endunless %}
{% endif %}
3 changes: 2 additions & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,6 @@

<!-- CSS
=================================================== -->
<link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.baseurl }}" media="all" />
<link rel="stylesheet" href="{{ "/assets/css/print.css" | prepend: site.baseurl }}" media="print" />

2 changes: 1 addition & 1 deletion _includes/navigation/drawer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% assign nav_class_suffix = include.nav_class_suffix | default: '' %}


<nav class="nav-accordion nav-mobile{{ nav_class_suffix }}" role="navigation">
<nav class="nav-accordion nav-mobile{{ nav_class_suffix }}{% if include.nav_sticky %} sticky {% endif %}" role="navigation">
<button class="sliding-panel-close{{ nav_class_suffix }}">
{% include svg/icons/close.svg %}
</button>
Expand Down
77 changes: 34 additions & 43 deletions _includes/related-posts.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,38 @@
<section class="usa-grid usa-section posts_feature">
{% assign hasSimilar = '' %}
{% for post in site.related_posts %}
{% assign postHasSimilar = false %}
{% for tag in post.tags %}
{% for thisTag in page.tags %}
{% if postHasSimilar == false and hasSimilar.size < 3 and post != page and tag == thisTag %}
{% if hasSimilar.size == 0 %}
<h2>Related Posts</h4>
<ul>
{% endif %}
<li class="usa-width-one-third">
<article>
<p class="post-date">{{ post.date | date: "%B %-d, %Y" }}</p>
<h3 class="posts_feature-heading">
<a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}
{% if post.series %}
(Series: {{ post.series }})
{% endif %}
</a>
</h3>
<p>{{ post.excerpt }}</p>
<p>
<a class="link-arrow-right post-link-continue_reading" href="{{ post.url | prepend: site.baseurl }}">
Continue reading
<span class="usa-sr-only">about {{ post.title }}</span>
{% include svg/icons/arrow-right.svg %}
</a>
</p>
<span class="post-tags" itemprop="keywords">
{% for tag in post.tags %}
<a class="usa-label" href="{{ site.baseurl }}/{{ site.tag_dir }}/{{ tag | slugify }}/">{{ tag }}
</a>
{% endfor %}
</span>
</article>
</li>
{% capture hasSimilar %}{{ hasSimilar }}*{% endcapture %}
{% assign postHasSimilar = true %}
{% if site.related_posts.size > 0 %}
<h2>Related posts</h2>
{% endif %}
<ul>
{% for post in page.related_posts %}
<li class="usa-width-one-third">
<article>
<p class="post-date">{{ post.date | date: "%B %-d, %Y" }}</p>
<h3 class="posts_feature-heading">
<a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}
{% if post.series %}
(Series: {{ post.series }})
{% endif %}
{% endfor %}
{% endfor %}
</a>
</h3>
<p>{{ post.excerpt }}</p>
<p>
<a class="link-arrow-right post-link-continue_reading" href="{{ post.url | prepend: site.baseurl }}">
Continue reading
<span class="usa-sr-only">about {{ post.title }}</span>
{% include svg/icons/arrow-right.svg %}
</a>
</p>
<span class="post-tags" itemprop="keywords">
{% for tag in post.tags %}
<a class="usa-label" href="{{ site.baseurl }}/{{ site.tag_dir }}/{{ tag | slugify }}/">{{ tag }}
</a>
{% endfor %}
</span>
</article>
</li>
{% if forloop.index > 2 %}
{% break %}
{% endif %}
{% endfor %}
{% if hasSimilar.size > 0 %}
</ul>
{% endif %}
</ul>
</section>
1 change: 0 additions & 1 deletion _includes/svg/icons/bars.svg

This file was deleted.

3 changes: 1 addition & 2 deletions _includes/svg/icons/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading