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 #2230

Merged
merged 32 commits into from
Jan 24, 2017
Merged

Dev --> master #2230

merged 32 commits into from
Jan 24, 2017

Conversation

gemfarmer
Copy link
Contributor

@gemfarmer gemfarmer commented Jan 23, 2017

Fixes issue(s) #2222, #2218, #2209, #1949, #2224

CircleCI

😎 PREVIEW

Changes proposed in this pull request:

/cc @coreycaitlin @austinhernandez

@@ -9,22 +9,22 @@ class UtilityClass
@utility_class = UtilityClass.new
@utility_class.extend(Jekyll::Utility)

@nav_items = YAML.load(File.read(File.join(Dir.pwd, 'spec/_data/navigation.yml')))['assigned']
@nav_items = YAML.safe_load(File.read(File.join(Dir.pwd, 'spec/_data/navigation.yml')))['assigned']

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [103/100]

@gemfarmer
Copy link
Contributor Author

Blocked until I get a lingering caret bug (in blog layout) fixed!

@gemfarmer gemfarmer changed the title [WIP] Dev --> master Dev --> master Jan 23, 2017
@coreycaitlin
Copy link

🤔 Our project pages have gotten oddly centered.

coreycaitlin and others added 3 commits January 23, 2017 16:59
@gemfarmer
Copy link
Contributor Author

gemfarmer commented Jan 24, 2017

I just did a site sweep and noticed that the project page cards lost there baseurl. I added in #2234. When that is merged into dev, I think this should be ready to go!

Add baseurl to project cards
@coreycaitlin coreycaitlin merged commit fd29fcd into master Jan 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants