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

[WIP] State page prototype #1355

Closed
wants to merge 1,011 commits into from
Closed
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
1011 commits
Select commit Hold shift + click to select a range
f49c857
Removes hairline border above first section and shrinks margin. Remov…
meiqimichelle Jun 14, 2016
7820d6e
Adds map borders where they're supposed to be. Lightens borders and h…
meiqimichelle Jun 14, 2016
0cdcb2e
Removes hairlines from h3. Removes process section, as it is now comb…
meiqimichelle Jun 14, 2016
0ca0b87
Cleans up tabs table with revenue process.
meiqimichelle Jun 14, 2016
e5c44ee
Shrinks and gray-ifies the details link in the line charts.
meiqimichelle Jun 14, 2016
88c3144
Swithces order of text and bar in revenues process table
meiqimichelle Jun 14, 2016
8abc25b
add gray background to second bar
gemfarmer Jun 14, 2016
e347184
Merge pull request #1489 from 18F/state-pages-merge
meiqimichelle Jun 14, 2016
6ad3528
Merge pull request #1496 from 18F/state-pages-content-rev
Jun 14, 2016
f597a67
sorted out some section heirarchy issues and revised content
Jun 14, 2016
2fa55fb
Merge pull request #1497 from 18F/state-profile-editing
meiqimichelle Jun 14, 2016
5e44b49
brings back simplified state intro, fixes stray Utah, tidies up some …
Jun 17, 2016
f3bc5f7
revised exports summary content
Jun 18, 2016
e2ecf9e
Merge pull request #1507 from 18F/state-export-content
shawnbot Jun 20, 2016
d0d44d2
start
gemfarmer Jun 20, 2016
39bc9d7
mid appraoch
gemfarmer Jun 20, 2016
7bab5b1
fixed the threshold for showing production ranks in the intro section
Jun 20, 2016
0b0aba7
everything works
gemfarmer Jun 21, 2016
4ca1758
refactor
gemfarmer Jun 21, 2016
9a19d02
removed exports charts for All and Total
Jun 20, 2016
f85a28e
make changes to rest of site
gemfarmer Jun 21, 2016
c180933
Merge pull request #1510 from 18F/state-export-fixes
gemfarmer Jun 21, 2016
8147582
stylez
gemfarmer Jun 21, 2016
3a2c8d9
select parent nav item
gemfarmer Jun 21, 2016
b097753
no parent duplication
gemfarmer Jun 21, 2016
01f541b
started nav is select
gemfarmer Jun 22, 2016
b936daf
make select work again
gemfarmer Jun 22, 2016
18a5327
houndy hound hound
gemfarmer Jun 22, 2016
8a697d6
hound: update ownership section class to #1495 class
gemfarmer Jun 22, 2016
94f135d
Merge pull request #1511 from 18F/sticky-nav-submenu
meiqimichelle Jun 22, 2016
3580b65
un-indent
Jun 22, 2016
6efc271
filter top products by rank == 1
Jun 22, 2016
bbefefc
add threshold template filter for more complex cases
Jun 22, 2016
4322cbc
nix threshold filter, because where_exp
Jun 22, 2016
c4ecede
Merge remote-tracking branch 'origin/state-pages' into state-intro-re…
Jun 22, 2016
f892261
Merge pull request #1506 from 18F/state-intro-revision
shawnbot Jun 23, 2016
09269bb
add npm legend
gemfarmer Jun 10, 2016
459c209
clean up
gemfarmer Jun 14, 2016
d0f4f2f
hide NaN values, align swatches
gemfarmer Jun 15, 2016
45aec12
clean up padding hack with js
gemfarmer Jun 15, 2016
988aad4
add revenue and employment charts
gemfarmer Jun 15, 2016
554484f
started land ownership legend
gemfarmer Jun 15, 2016
a864744
land ownership spacing
gemfarmer Jun 15, 2016
ea3fa5b
filter legend swatches
gemfarmer Jun 16, 2016
9dfb801
Rebase, grid
gemfarmer Jun 16, 2016
ab80f25
units
gemfarmer Jun 16, 2016
8a2fb60
pounds
gemfarmer Jun 16, 2016
814e5a1
got rid of rounding issue
gemfarmer Jun 16, 2016
ff042c1
clean up
gemfarmer Jun 16, 2016
3a48790
hound, remove threshold
gemfarmer Jun 16, 2016
2048045
clean up css, js
gemfarmer Jun 20, 2016
8795140
reverse order
gemfarmer Jun 22, 2016
13b7799
resh sh sh sh uffle
gemfarmer Jun 22, 2016
cccc8a7
replace with d3.range()
gemfarmer Jun 22, 2016
a97db88
unit logic
gemfarmer Jun 22, 2016
9822f9b
post rebase
gemfarmer Jun 22, 2016
2c0603f
Replace legend with svg legend
gemfarmer Jun 23, 2016
2614578
hound
gemfarmer Jun 23, 2016
6fc39e5
rename, remove unnecessary code
gemfarmer Jun 23, 2016
cb39284
hound
gemfarmer Jun 23, 2016
c953a3d
hound
gemfarmer Jun 23, 2016
4de90b0
Merge pull request #1495 from 18F/map-legends
shawnbot Jun 24, 2016
66669ae
restructured state profile
Jun 24, 2016
d74ce74
adjustments to land ownership
gemfarmer Jun 24, 2016
176f7d1
Merge pull request #1527 from 18F/state-hierarchy-revision
gemfarmer Jun 24, 2016
0982471
Initial commit for bringing megachart into line with Eric's mocks
meiqimichelle Jun 24, 2016
6d0a3c5
Latest work
meiqimichelle Jun 24, 2016
1aa204e
add phase content to content tab
gemfarmer Jun 24, 2016
3c6cf19
updated revenue-type-table, removed old process table
gemfarmer Jun 24, 2016
26365d2
Merge pull request #1529 from 18F/megachart-tidy
meiqimichelle Jun 24, 2016
dc335b2
stacked bars
gemfarmer Jun 24, 2016
246bea4
nest bars
gemfarmer Jun 25, 2016
5807107
two alternative ways of doing this
gemfarmer Jun 23, 2016
73fd808
special cases
gemfarmer Jun 24, 2016
0ada6cb
added regulations section
gemfarmer Jun 25, 2016
2e791c1
glossary item fix
gemfarmer Jun 25, 2016
c4694f7
conditionals in place
gemfarmer Jun 25, 2016
eb69507
clean up, prevent nav from displaying when it isn't present
gemfarmer Jun 25, 2016
56f8d7a
is special state
gemfarmer Jun 25, 2016
698dafc
hound
gemfarmer Jun 25, 2016
70ac4f6
Merge branch 'special-cases' into state-pages
Jun 27, 2016
e138090
revised framing content for jobs section and added intro for self-emp…
Jun 27, 2016
52f8b29
added links to each data and documentation page or section
Jun 27, 2016
aa90227
added disbursements intro
Jun 28, 2016
65e7185
added two words
Jun 28, 2016
e9e9e42
moved regulations out of nav and into state revenue section, edited f…
Jun 28, 2016
e64fe2d
edited Alaska info
Jun 28, 2016
5d54661
edited more state info
Jun 28, 2016
8ee8557
Merge pull request #1533 from 18F/job-types-content
meiqimichelle Jun 28, 2016
25593f2
Merge pull request #1534 from 18F/state-data-links
meiqimichelle Jun 28, 2016
4adb668
Merge pull request #1536 from 18F/priority-state-content
meiqimichelle Jun 28, 2016
6541d84
edits to disbursements
Jun 28, 2016
29511c0
more edits to disbursements
Jun 28, 2016
57ae4cb
Merge pull request #1540 from 18F/disbursements-fix
meiqimichelle Jun 29, 2016
98d0337
Merge pull request #1531 from 18F/megachart-tidy
meiqimichelle Jun 29, 2016
3247bae
shortened copy
Jun 29, 2016
1028fa9
removed another sentence
Jun 29, 2016
6f4e206
edited more state info
Jun 29, 2016
dfffb4a
Merge pull request #1542 from 18F/jobs-copy-edits
meiqimichelle Jun 29, 2016
e5fd34c
Merge pull request #1544 from 18F/state-regulations-edits
meiqimichelle Jun 29, 2016
6d21bd9
comments out disbursements
Jun 29, 2016
9162baa
add <eiti-bar-chart>, replace revenue charts
Jun 30, 2016
98d33be
replace line charts with bars
Jun 30, 2016
dc29ab0
remove <eiti-line-chart> for good
Jun 30, 2016
e466196
add explicit format string for production values
Jun 30, 2016
18f675f
Merge pull request #1545 from 18F/rm-disbursements
meiqimichelle Jun 30, 2016
9fd5769
Merge pull request #1548 from 18F/state-charts
meiqimichelle Jun 30, 2016
548e36b
Changes tabs from green to gray with better spacing and active-not-ac…
meiqimichelle Jul 1, 2016
c8d1947
Changes arrow phases to gray box phases with extra explanations.
meiqimichelle Jul 1, 2016
06a8f09
Cleans up headings in the megatables
meiqimichelle Jul 1, 2016
914c097
Adds corey's latest words, except solar and wind, to magechart.
meiqimichelle Jul 1, 2016
7aa3cca
Removes details toggle from charts as per #1491
meiqimichelle Jul 1, 2016
f9ae488
Adds more space between large chart lists. Makes explainer sentence s…
meiqimichelle Jul 1, 2016
7da092b
Adjusts map sizes in county views. Adds summary sentences to federal …
meiqimichelle Jul 1, 2016
e55f7f4
Hound
meiqimichelle Jul 1, 2016
bda6ec7
Hound fix
meiqimichelle Jul 1, 2016
96d5efb
Merge pull request #1555 from 18F/megachart-tidy-eh
Jul 1, 2016
327d8e2
Merge branch 'dev' into state-pages
Jul 1, 2016
4867852
Merge remote-tracking branch 'origin/state-pages' into state-pages
Jul 1, 2016
097e3a9
edited geothermal rates language
Jul 1, 2016
f4d168e
changes tab titles for the revenue process chart
Jul 2, 2016
4100287
data showing up
gemfarmer Jul 5, 2016
a0d8535
add bar chart to state pages
gemfarmer Jul 5, 2016
20b5acf
clean up, rounding
gemfarmer Jul 5, 2016
e9d8916
remove model file
gemfarmer Jul 5, 2016
4173de2
remove debug file
gemfarmer Jul 5, 2016
dd72cc4
remove details chart
gemfarmer Jul 5, 2016
99b3b2e
Merge pull request #1569 from 18F/data-state-self-employment
Jul 5, 2016
70e139e
Merge pull request #1561 from 18F/geothermal-rates
meiqimichelle Jul 5, 2016
7ccc23e
Merge pull request #1562 from 18F/revenue-chart-titles
meiqimichelle Jul 5, 2016
8a5737c
federal production units
gemfarmer Jul 6, 2016
aa2cb7e
units title
gemfarmer Jul 6, 2016
0119135
update all production renewables units
gemfarmer Jul 6, 2016
447b0b0
clean up
gemfarmer Jul 6, 2016
3d6ddb1
clean up units file
gemfarmer Jul 6, 2016
883a3be
new yml structure
gemfarmer Jul 6, 2016
3ab2729
units update
gemfarmer Jul 6, 2016
ae6a201
alter units
gemfarmer Jul 6, 2016
13fe769
Merge pull request #1576 from 18F/update-units
Jul 6, 2016
2e09152
add page configs
gemfarmer Jul 7, 2016
aa44f75
rule separators
gemfarmer Jul 7, 2016
ad025b5
change location of bar figcaption, fluffing
gemfarmer Jul 7, 2016
d35c3e0
hound
gemfarmer Jul 7, 2016
97986cd
hound
gemfarmer Jul 7, 2016
929896e
all production data! and bars
gemfarmer Jul 7, 2016
5a6056e
federal production, owernship
gemfarmer Jul 7, 2016
d06cfda
remove unnecessary production navs
gemfarmer Jul 8, 2016
81d2de5
jobs, revenues, gdp
gemfarmer Jul 8, 2016
9c6959a
exports
gemfarmer Jul 8, 2016
84433ef
self employment
gemfarmer Jul 8, 2016
92f4cf6
make file task additions
gemfarmer Jul 8, 2016
9f5f0df
remove nav items
gemfarmer Jul 8, 2016
811fbbd
Merge pull request #1580 from 18F/national-page
meiqimichelle Jul 8, 2016
654a830
Merge pull request #1578 from 18F/state-page-style
Jul 11, 2016
927f990
all working except exports
gemfarmer Jul 11, 2016
86cdea8
exports working
gemfarmer Jul 12, 2016
6440a31
flexbox
gemfarmer Jul 12, 2016
3dd8233
add bars baseline
gemfarmer Jul 12, 2016
f23edda
start of selector
gemfarmer Jul 12, 2016
436d80d
year selector tweaks
gemfarmer Jul 12, 2016
2760e84
comment to_list filter
gemfarmer Jul 12, 2016
55e0602
year switcher section component
gemfarmer Jul 12, 2016
75d0d3b
added years_property attribute to county map template
gemfarmer Jul 12, 2016
70172a8
rename <data-map> to <eiti-data-map>
Jul 12, 2016
07de126
fix stray legendSettings
Jul 12, 2016
e903dc6
add map_hash filter for dealing with nested data
Jul 12, 2016
65c6747
allow map_hash to take a nested key
Jul 13, 2016
30ecb98
clean up year selector logic and data map
Jul 13, 2016
a08b1f0
sunset the line-chart-data.json include
Jul 13, 2016
4e1fb58
year switcher for exports, fed. prod.
Jul 13, 2016
d2583e7
assign year_range; set x-range on bars
Jul 13, 2016
6f9e62c
new build without console.log()
Jul 13, 2016
f351e44
add selector to all sections
gemfarmer Jul 13, 2016
8698a25
assign instead of capture
gemfarmer Jul 13, 2016
21cf691
national all-production
gemfarmer Jul 13, 2016
a751dd9
federal production
gemfarmer Jul 13, 2016
08f1f54
national revenue
gemfarmer Jul 13, 2016
c7d66a3
gdp
gemfarmer Jul 13, 2016
f881182
jobs
gemfarmer Jul 13, 2016
11c116e
exports
gemfarmer Jul 13, 2016
49b78d7
hound scss
gemfarmer Jul 13, 2016
d5ab602
hound ruby
gemfarmer Jul 13, 2016
b3824a0
x1000 on all production
gemfarmer Jul 13, 2016
5639fde
content and hierarchy edits
Jul 14, 2016
3ddeeff
Merge pull request #1592 from 18F/state-pages-new-layout
Jul 14, 2016
68fda60
two small edits
Jul 14, 2016
00b68da
Merge pull request #1600 from 18F/content-feedback-2
Jul 14, 2016
b69f632
federal production table
gemfarmer Jul 14, 2016
1e9a962
federal revenue
gemfarmer Jul 14, 2016
1c7ce08
federal production style start
gemfarmer Jul 14, 2016
72f5fa4
charts mostly work for production
gemfarmer Jul 15, 2016
37fb446
bars and numbers chaning
gemfarmer Jul 18, 2016
3f378ff
all changes working
gemfarmer Jul 18, 2016
87f333d
update caption
gemfarmer Jul 18, 2016
5a17ba2
background
gemfarmer Jul 18, 2016
9d3748b
Added to revenue, need to call .scale() beyond init
gemfarmer Jul 18, 2016
1460b4b
revises Montana state regulations info to match opt-in content
Jul 18, 2016
a2851f9
jobs
gemfarmer Jul 18, 2016
cf40c9f
styling
gemfarmer Jul 18, 2016
b9efe57
Spaces
gemfarmer Jul 18, 2016
5f70de8
styles
gemfarmer Jul 18, 2016
8a77fd9
remove data.db
gemfarmer Jul 19, 2016
f6a190d
Merge pull request #1598 from 18F/production-x-1000
gemfarmer Jul 19, 2016
78949d3
Merge branch 'state-pages' of https://github.com/18F/doi-extractives-…
gemfarmer Jul 19, 2016
f20989f
removed biomass subtypes from yml files, changed units to megawatt hours
gemfarmer Jul 19, 2016
c68976e
change top state products
gemfarmer Jul 19, 2016
0ebc561
changed revenue from Blues to Reds
gemfarmer Jul 19, 2016
1aeb54c
Merge pull request #1621 from 18F/opt-in-mt
meiqimichelle Jul 19, 2016
0d606b8
remove wrong states-pages script
gemfarmer Jul 19, 2016
529b217
remove federal revenue tiles
gemfarmer Jul 19, 2016
891a8c8
removes unused files and code
Jul 19, 2016
5a31b37
move state regulations and "special" flags to _states
Jul 19, 2016
ece9bee
restore process table
gemfarmer Jul 19, 2016
d23ac8f
Merge pull request #1625 from 18F/file-cleanup
gemfarmer Jul 19, 2016
add2f0d
Merge branch 'state-pages' of https://github.com/18F/doi-extractives-…
gemfarmer Jul 19, 2016
87199c9
Merge pull request #1624 from 18F/group-production-data
Jul 19, 2016
1802302
Merge pull request #1604 from 18F/county-tables-changes
meiqimichelle Jul 19, 2016
e253ffb
Merge branch 'state-pages' of https://github.com/18F/doi-extractives-…
gemfarmer Jul 19, 2016
3f9ab0b
clean up federal production units
gemfarmer Jul 19, 2016
b32a541
small typo on cgals
gemfarmer Jul 20, 2016
62ed7bf
Merge pull request #1627 from 18F/federal-production-units
gemfarmer Jul 20, 2016
12fe2af
error breaking national page fixed
gemfarmer Jul 20, 2016
eb3fb3c
filter data that only bars within the appropriate year range render
gemfarmer Jul 20, 2016
b4e9f80
update logic that checks for legend
gemfarmer Jul 20, 2016
7f94aef
remove unnecessary and incorrect conditional
gemfarmer Jul 20, 2016
f3ac501
homepage and about
gemfarmer Jul 20, 2016
25a6c82
how it works, content, landing, state-page
gemfarmer Jul 20, 2016
a39dbb1
page breaks
gemfarmer Jul 20, 2016
ebdc89b
hound
gemfarmer Jul 20, 2016
b829ddd
hound
gemfarmer Jul 20, 2016
c74273e
hound
gemfarmer Jul 20, 2016
e19da24
cleanup
gemfarmer Jul 21, 2016
daca8d9
Merge pull request #1631 from 18F/bars-bug
gemfarmer Jul 21, 2016
346ef55
add icon nav
gemfarmer Jul 21, 2016
3d782dc
make nav stick in right place
gemfarmer Jul 21, 2016
1d33def
added header to national page
gemfarmer Jul 21, 2016
44dc568
hound
gemfarmer Jul 21, 2016
36ab0a1
page break
gemfarmer Jul 21, 2016
d5b2062
Merge pull request #1636 from 18F/iconic-nav
gemfarmer Jul 21, 2016
0e5e477
Merge pull request #1633 from 18F/print-stylesheet
gemfarmer Jul 21, 2016
592f4ac
clean up state names in coal all production
Jul 22, 2016
81ba302
strip header rows; re-add 2012-2014 coal data
Jul 22, 2016
843c173
update coal data, yay
Jul 22, 2016
52d36c9
nix coal rollup
Jul 22, 2016
0221254
uppercase DISTINCT
Jul 22, 2016
f349cf4
restructuring and montana addition
Jul 23, 2016
50ebaab
more state edits
Jul 23, 2016
6a792e8
minor edits and cleanup
Jul 25, 2016
223a6b9
Merge pull request #1647 from 18F/montana-addition
gemfarmer Jul 25, 2016
1b75656
Merge pull request #1645 from 18F/fix-coal-rollups
gemfarmer Jul 25, 2016
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
.sass-cache
.jekyll-metadata
_site
*.db
node_modules
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.2.6
11 changes: 11 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ exclude:
- test
- styleguide-template
- 'Gemfile*'
- '**/*.sh'
- data/db

collections:
case-studies:
Expand All @@ -45,5 +47,14 @@ defaults:
values:
layout: federal-revenue-by-company

page_gen:
- data: 'states'
template: 'state-page'
name: 'id'
dir: 'states'
extension: 'html'

page_gen_dirs: true

shruggie:
- d8394cf27efbf8ae2f96ee12788eb257f4358a42
Loading