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

Update gems, fix line break #2209

Merged
merged 1 commit into from
Jan 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
source 'https://rubygems.org'

ruby '2.3.1'

gem 'accesslint-ci', '0.2.6'
gem 'html-proofer'
gem 'jekyll', '~> 3.1'
gem 'jekyll', '~> 3.3.0'
gem 'jemoji'

group :jekyll_plugins do
Expand Down
50 changes: 26 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
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)
Expand All @@ -33,25 +34,25 @@ GEM
chromedriver-helper (1.0.0)
archive-zip (~> 0.7.0)
nokogiri (~> 1.6)
codeclimate-test-reporter (1.0.4)
codeclimate-test-reporter (1.0.5)
simplecov
coderay (1.1.1)
colorator (1.1.0)
colored (1.2)
colorize (0.8.1)
diff-lcs (1.2.5)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.20161129)
unf (>= 0.0.5, < 1.0.0)
ethon (0.9.1)
ethon (0.10.1)
ffi (>= 1.3.0)
ffi (1.9.14)
ffi (1.9.17)
forwardable-extended (2.6.0)
gemoji (2.1.0)
html-pipeline (2.4.2)
html-pipeline (2.5.0)
activesupport (>= 2)
nokogiri (>= 1.4)
html-proofer (3.2.0)
html-proofer (3.4.0)
activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
colored (~> 1.2)
Expand All @@ -65,7 +66,7 @@ GEM
domain_name (~> 0.5)
i18n (0.7.0)
io-like (0.3.0)
jekyll (3.3.0)
jekyll (3.3.1)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
Expand All @@ -79,17 +80,17 @@ GEM
jekyll-feed (0.8.0)
jekyll (~> 3.3)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.11.0)
jekyll (>= 2.0)
jekyll-sass-converter (1.4.0)
jekyll-redirect-from (0.12.1)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
jekyll-seo-tag (2.0.0)
jekyll (~> 3.1)
jekyll-sitemap (0.12.0)
jekyll-seo-tag (2.1.0)
jekyll (~> 3.3)
jekyll-sitemap (1.0.0)
jekyll (~> 3.3)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
jekyll_frontmatter_tests (0.0.8)
jekyll_frontmatter_tests (0.0.13)
jekyll (>= 2.0, < 4.0)
jekyll_pages_api (0.1.6)
htmlentities (~> 4.3)
Expand All @@ -102,8 +103,8 @@ GEM
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0)
json (1.8.3)
kramdown (1.12.0)
json (1.8.6)
kramdown (1.13.2)
liquid (3.0.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -114,25 +115,26 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
minitest (5.10.1)
netrc (0.11.0)
nokogiri (1.6.8.1)
nokogiri (1.7.0.1)
mini_portile2 (~> 2.1.0)
parallel (1.9.0)
parallel (1.10.0)
pathutil (0.14.0)
forwardable-extended (~> 2.6)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (2.0.5)
rack (1.6.5)
rack-jekyll (0.5.0)
jekyll (>= 1.3)
listen (>= 1.3)
rack (~> 1.5)
rack-test (0.6.3)
rack (>= 1.0)
rb-fsevent (0.9.7)
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rb-readline (0.5.3)
Expand All @@ -156,7 +158,7 @@ GEM
rspec-support (3.5.0)
rubyzip (1.2.0)
safe_yaml (1.0.4)
sass (3.4.22)
sass (3.4.23)
selenium-webdriver (3.0.5)
childprocess (~> 0.5)
rubyzip (~> 1.0)
Expand All @@ -179,7 +181,7 @@ GEM
websocket (1.2.3)
xpath (2.0.0)
nokogiri (~> 1.3)
yell (2.0.6)
yell (2.0.7)

PLATFORMS
ruby
Expand All @@ -191,7 +193,7 @@ DEPENDENCIES
codeclimate-test-reporter (~> 1.0.0)
colorize
html-proofer
jekyll (~> 3.1)
jekyll (~> 3.3.0)
jekyll-archives!
jekyll-feed
jekyll-paginate
Expand Down
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% include head.html %}

<body class="{% if page.type == "tag"%}tag-{% endif %}page-{{ page.title | slugify }}
{% if page.header_border == true %}header_border{% endif %} {% if page.path contains '_posts' %}single-post{% endif %}">
{% if layout.header_border == true %}header_border{% endif %} {% if page.path contains '_posts' %}single-post{% endif %}">

{% include header.html %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors:
- jhunter
tags:
- staff profiles
- acquisition
- acquisition services
excerpt: "Mark Hopson joined 18F in January, 2016 after working as a Contracting Officer at the Census Bureau. He works for the TTS Office of Acquisitions on call orders for the Agile BPA, procurement strategy, and other projects that are helping advance the way that government buys technology."
image: /assets/img/team/mark-hopson.jpg
hero: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ title: "The best way to build big is to start small"
authors:
- kane
tags:
- architecture
- product
excerpt: "Large software systems are hard, and in government we're tasked with building large systems to manage complex benefits and processes. Often those mandates arrive on the back of a failing legacy system. An agile workflow has the benefit of allowing us to try out our ideas before committing to years of time and money."
image: /assets/blog/build-big/quizzical.jpg
Expand Down
2 changes: 1 addition & 1 deletion _sass/_components/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
.header_border,
.single-post {
header[role=banner] {
border-bottom: 1px solid #cccccc; // See if we can use a WDS color
border-bottom: 1px solid $color-gray-lighter;
}
}

Expand Down
11 changes: 6 additions & 5 deletions tests/schema/_projects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ github_repo: "String"
project_url: "String"
permalink: "String"
config:
path: '_projects'
path: _projects
ignore:
- README.md
- ..
- .
- .DS_Store
optional:
- 'image'
- 'image_accessibility'
- 'expiration_date'
- 'github_repo'
- image
- image_accessibility
- expiration_date
- github_repo
- project_url
---
2 changes: 2 additions & 0 deletions tests/schema/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- demo day
- denver federal center
- department of commerce
- department of labor
- design
- devops
- digital acquisition accelerator
Expand Down Expand Up @@ -81,6 +82,7 @@
- platforms
- presidential innovation fellows
- proactive partner
- product
- procurement
- public buildings service
- pulse.cio.gov
Expand Down