Skip to content
This repository has been archived by the owner on Nov 10, 2020. It is now read-only.

Staging --> master (v2.1.9) #2261

Merged
merged 66 commits into from
Apr 18, 2017
Merged

Staging --> master (v2.1.9) #2261

merged 66 commits into from
Apr 18, 2017

Conversation

meiqimichelle
Copy link
Contributor

CircleCI

😎 PREVIEW

Changes proposed in this pull request:

/cc @gemfarmer @ericronne

gemfarmer and others added 30 commits March 8, 2017 18:25
Brings link/button blue into 508 compliance over $pale-gray
Official Website banner: simplified / Global header changes
Megachart negatives numbers
gemfarmer and others added 22 commits April 10, 2017 11:30
Fix position of oil rig on homepage
migrate to federalist.fr.cloud.gov
2016 Federal revenue by company
Darkened county fills on case-study — and state laws — maps
* Various table format adjustments

 - Equalized top and bottom cell padding
 - Changed indenting method to padding-left
 - Added styling for the “sup” class, which enabled me to shift the
superscript numbers slightly down, as well as adding a little spacing
on the left (so they don’t almost hit the adjacent text)
 - Tightened up the table line height a bit

On these tables, we still need to adjust the leading for lines which
have footnotes. (The number forces line heights to be too generous.)

Definitely high likelihood of syntax glitches here! :fingers crossed:

More to come!

* fixed footnote markdown bug

* az
* added new search fields

* coerce url

* coerce url

* coerce
Brought this table into line with others, style wise, and eliminated
the ` article_table-gray ` class, which is now used nowhere.

**Note: I couldn’t find what’s causing the gray fill on the table
header. Help!**
We may now be mergeable! 🙏
Address broken internal links
@include respond-to(medium-up) {
@include span-columns(3);
}
@include respond-to(medium-up) {

Choose a reason for hiding this comment

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

Line should be indented 2 spaces, but was indented 3 spaces

@@ -48,11 +47,13 @@ header,
}

.header-left {
@include span-columns(6);
@include span-columns(6);
margin-bottom: $base-padding;

Choose a reason for hiding this comment

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

Line should be indented 2 spaces, but was indented 3 spaces

@@ -48,11 +47,13 @@ header,
}

.header-left {
@include span-columns(6);
@include span-columns(6);

Choose a reason for hiding this comment

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

Line should be indented 2 spaces, but was indented 3 spaces

@@ -12,15 +12,16 @@ def create_store(collections)
obj = {}
collections.each do |collection|
collection['docs'].each do |doc|
if doc.data['title'] && doc.data['description'] && doc.data['tag'] && doc.data['permalink']
url = doc.data['permalink'] || doc.url
if doc.data['title'] && doc.data['description'] && doc.data['tag'] && url

Choose a reason for hiding this comment

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

Use a guard clause instead of wrapping the code inside a conditional expression.

@@ -74,6 +77,28 @@ def intcomma(value, delimiter=",")
orig == copy ? copy : intcomma(copy, delimiter)
end

def intcomma_dollar(value, delimiter=",")

Choose a reason for hiding this comment

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

Surrounding space missing in default value assignment.
Prefer single-quoted strings when you don't need string interpolation or special symbols.

@@ -5,7 +5,7 @@ def generate(site)
# Federalist preview URL for this branch.
branch = ENV['BRANCH']
if branch && branch != 'master'
site.config['url'] = "https://federalist.18f.gov/preview/18F/doi-extractives-data/#{branch}"
site.config['url'] = "https://federalist.fr.cloud.gov/preview/18f/doi-extractives-data/#{branch}"

Choose a reason for hiding this comment

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

Line is too long. [105/100]

@gemfarmer gemfarmer changed the title Staging --> master Staging --> master (v2.1.9) Apr 18, 2017
Copy link
Contributor

@gemfarmer gemfarmer left a comment

Choose a reason for hiding this comment

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

LGTM!

@gemfarmer gemfarmer merged commit 5539c1f into master Apr 18, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants