Skip to content

Commit 3fe058a

Browse files
authored
Merge pull request #2373 from 18F/dev
Dev --> master
2 parents 2991834 + 8c8b9f2 commit 3fe058a

File tree

94 files changed

+1812
-1338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1812
-1338
lines changed

.bundle/config

Lines changed: 0 additions & 3 deletions
This file was deleted.

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ source 'https://rubygems.org'
22

33
ruby '2.3.1'
44

5-
gem 'accesslint-ci', '0.2.6'
5+
gem 'accesslint-ci', '0.2.8'
66
gem 'html-proofer'
77
gem 'jekyll', '~> 3.3.0'
88
gem 'jemoji'
9+
gem 'parallel'
910

1011
group :jekyll_plugins do
1112
gem 'jekyll-archives', git: 'git://github.com/jekyll/jekyll-archives.git', ref: '112c508'
@@ -14,7 +15,7 @@ group :jekyll_plugins do
1415
gem 'jekyll-redirect-from'
1516
gem 'jekyll-seo-tag'
1617
gem 'jekyll-sitemap'
17-
gem 'jekyll_frontmatter_tests'
18+
gem 'jekyll_frontmatter_tests', '~> 0.1.0'
1819
gem 'jekyll_pages_api'
1920
gem 'jekyll_pages_api_search'
2021
gem 'jekyll_oembed'

Gemfile.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GIT
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
accesslint-ci (0.2.6)
12+
accesslint-ci (0.2.8)
1313
rest-client (~> 2.0)
1414
thor (~> 0.19)
1515
activesupport (4.2.8)
@@ -89,7 +89,7 @@ GEM
8989
jekyll (~> 3.3)
9090
jekyll-watch (1.5.0)
9191
listen (~> 3.0, < 3.1)
92-
jekyll_frontmatter_tests (0.0.13)
92+
jekyll_frontmatter_tests (0.1.0)
9393
jekyll (>= 2.0, < 4.0)
9494
jekyll_oembed (0.0.3)
9595
jekyll (~> 3)
@@ -190,7 +190,7 @@ PLATFORMS
190190
ruby
191191

192192
DEPENDENCIES
193-
accesslint-ci (= 0.2.6)
193+
accesslint-ci (= 0.2.8)
194194
capybara
195195
chromedriver-helper
196196
codeclimate-test-reporter (~> 1.0.0)
@@ -203,11 +203,12 @@ DEPENDENCIES
203203
jekyll-redirect-from
204204
jekyll-seo-tag
205205
jekyll-sitemap
206-
jekyll_frontmatter_tests
206+
jekyll_frontmatter_tests (~> 0.1.0)
207207
jekyll_oembed
208208
jekyll_pages_api
209209
jekyll_pages_api_search
210210
jemoji
211+
parallel
211212
pry
212213
rack-jekyll
213214
rb-readline

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44

55
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/).
66

7-
As of March 2017, we maintain a styleguide for components used across the site at 18f.gsa.gov/styleguide.
7+
### Style and style guide
8+
9+
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.
10+
11+
[View style guide](https://18f.gsa.gov/styleguide/)
812

913
### History
1014

_about/index.md

Lines changed: 41 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,14 @@ layout: default-intro
66
lead: We help other government agencies build, buy, and share technology products.
77
banner_cta: true
88
subnav_items:
9-
-
10-
text: Our principles
11-
permalink: /about/#our-principles
12-
in_subnav: true
13-
-
14-
text: Our team
15-
permalink: /about/#our-team
16-
in_subnav: true
17-
-
18-
text: History and funding
19-
permalink: /about/#history-and-funding
20-
in_subnav: true
21-
-
22-
text: For press
23-
permalink: /about/#for-press
24-
in_subnav: true
9+
- text: Our principles
10+
permalink: /about/#our-principles
11+
- text: Our team
12+
permalink: /about/#our-team
13+
- text: History and funding
14+
permalink: /about/#history-and-funding
15+
- text: For press
16+
permalink: /about/#for-press
2517
---
2618

2719
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:
3022

3123
We strive to work in a modern way and use best practices on all our projects. Here's what that means to us:
3224

33-
<div class="icon-list">
34-
<figure class="icon-list-image">{% include svg/icons/respect-icon.svg %}</figure>
35-
<div class="icon-list-text">
36-
<p class="paragraph-bold">Respect for government workers</p>
37-
<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>
38-
</div>
39-
</div>
40-
41-
<div class="icon-list">
42-
<figure class="icon-list-image">{% include svg/icons/user-centered-icon.svg %}</figure>
43-
<div class="icon-list-text">
44-
<p class="paragraph-bold">Human-centered design</p>
45-
<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>
46-
</div>
47-
</div>
48-
49-
<div class="icon-list">
50-
<figure class="icon-list-image">{% include svg/icons/agile-icon.svg %}</figure>
51-
<div class="icon-list-text">
52-
<p class="paragraph-bold">Agile methods</p>
53-
<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>
54-
</div>
55-
</div>
56-
57-
<div class="icon-list">
58-
<figure class="icon-list-image">{% include svg/icons/open-icon.svg %}</figure>
59-
<div class="icon-list-text">
60-
<p class="paragraph-bold">Open technology</p>
61-
<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>
62-
</div>
63-
</div>
25+
<ul class="icon-list-wrapper">
26+
<li class="icon-list">
27+
<figure class="icon-list-image">{% include svg/icons/respect-icon.svg %}</figure>
28+
<div class="icon-list-text">
29+
<p class="p-bold">Respect for government workers</p>
30+
<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>
31+
</div>
32+
</li>
33+
34+
<li class="icon-list">
35+
<figure class="icon-list-image">{% include svg/icons/user-centered-icon.svg %}</figure>
36+
<div class="icon-list-text">
37+
<p class="p-bold">Human-centered design</p>
38+
<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>
39+
</div>
40+
</li>
41+
42+
<li class="icon-list">
43+
<figure class="icon-list-image">{% include svg/icons/agile-icon.svg %}</figure>
44+
<div class="icon-list-text">
45+
<p class="p-bold">Agile methods</p>
46+
<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>
47+
</div>
48+
</li>
49+
50+
<li class="icon-list">
51+
<figure class="icon-list-image">{% include svg/icons/open-icon.svg %}</figure>
52+
<div class="icon-list-text">
53+
<p class="p-bold">Open technology</p>
54+
<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>
55+
</div>
56+
</li>
57+
</ul>
6458

6559
To learn more about how we work, explore [18F guides](https://pages.18f.gov/guides/).
6660

_config-accesslint.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ exclude:
3434
- README.md
3535
- robots.txt
3636
- search-index*
37-
- serve
38-
- serve-blog
39-
- serve-fast
40-
- serve-accesslint
4137
- spec/
4238
- system-security-plan.yml
4339
- tags/
@@ -372,5 +368,6 @@ exclude:
372368
- _posts/2017-01-06-open-source-collaboration-across-agencies-to-improve-https-deployment.md
373369
- _posts/2017-01-10-mark-hopson-negotiating-on-americas-behalf.md
374370
- _posts/2017-01-11-the-best-way-to-build-big-is-to-start-small.md
371+
- _posts/2017-01-17-life-changing-magic-writing-release-notes.md
375372
---
376373

_config-blog.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ exclude:
3232
- README.md
3333
- robots.txt
3434
- search-index*
35-
- serve
36-
- serve-blog
37-
- serve-fast
38-
- serve-accesslint
3935
- spec/
4036
- system-security-plan.yml
4137
- tests/
@@ -369,5 +365,6 @@ exclude:
369365
- _posts/2017-01-06-open-source-collaboration-across-agencies-to-improve-https-deployment.md
370366
- _posts/2017-01-10-mark-hopson-negotiating-on-americas-behalf.md
371367
- _posts/2017-01-11-the-best-way-to-build-big-is-to-start-small.md
368+
- _posts/2017-01-17-life-changing-magic-writing-release-notes.md
372369
---
373370

_config-fast-builds.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ exclude:
3939
- README.md
4040
- robots.txt
4141
- search-index*
42-
- serve
43-
- serve-blog
44-
- serve-fast
45-
- serve-accesslint
4642
- sitemap.xml
4743
- spec/
4844
- system-security-plan.yml

_config.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ federalist_url: "https://federalist.18f.gov"
88
localhost: "localhost:4000"
99
env: "production"
1010
logo: /assets/img/logos/18F-Logo-Bright-S.png
11-
feature_image: /assets/img/feature-background.jpg
1211
tag_dir: tags
1312
github_repo: https://github.com/18F/18f.gsa.gov/blob/master
1413

14+
related_posts: 3
15+
16+
1517
analytics:
1618
google:
1719
code: 'UA-48605964-1' # Change this to your GSA analytics code
@@ -142,10 +144,6 @@ exclude:
142144
- pages/our-work.html
143145
- PULL_REQUEST_TEMPLATE.md
144146
- README.md
145-
- serve
146-
- serve-blog
147-
- serve-fast
148-
- serve-accesslint
149147
- spec/
150148
- system-security-plan.yml
151149
- tests/

0 commit comments

Comments
 (0)