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

Feat: Cal-ITP redesign #120

Merged
merged 341 commits into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
341 commits
Select commit Hold shift + click to select a range
4cc881b
chore(press): add benefits press release content
thekaveman May 17, 2023
caa91ca
fix(style): use absolute URL for site assets
thekaveman May 17, 2023
97fbe40
fix(config): set timezone to America/Los_Angeles
thekaveman May 17, 2023
96ba6ac
refactor(press): default location is Sacramento, CA
thekaveman May 17, 2023
616d791
refactor(press): make lead paragraph optional
thekaveman May 17, 2023
080a67f
chore(press): add ODS press release content
thekaveman May 17, 2023
efe9b14
chore(press): add CoastRTA press release content
thekaveman May 17, 2023
00b4dd2
fix(press): add horizontal rule under lead
thekaveman May 17, 2023
92133f9
refactor: extract the common redirect
thekaveman May 18, 2023
65a2cc6
refactor(press): reverse string concatenation
thekaveman May 18, 2023
4794eaf
chore(nav): update link to Press page
thekaveman May 18, 2023
757d5f6
Feat: define Jekyll collection for Press (#118)
thekaveman May 18, 2023
4e67a36
feat(resources): define Jekyll collection
thekaveman May 18, 2023
ea53fa9
feat(resources): define initial collection items
thekaveman May 18, 2023
e05e64a
feat(resources): landing page renders collection items
thekaveman May 18, 2023
554a092
chore(nav): link to resources landing page
thekaveman May 18, 2023
f448173
chore: use Jekyll's link helper
thekaveman May 18, 2023
56fada8
fix(resources): normalize casing
thekaveman May 18, 2023
3bdfa84
chore(resources): use smart quotes
thekaveman May 18, 2023
e119b37
fix(resources): normalize casing
thekaveman May 18, 2023
df6323b
Feat: define Jekyll collection for Resources (#144)
thekaveman May 18, 2023
9eda201
fix(resource): update benefits overview file, date
thekaveman May 19, 2023
0eef84e
Fix: update Benefits overview resource (#147)
thekaveman May 22, 2023
36ac291
refactor(css): remove no longer used class
machikoyasuda May 31, 2023
d404ffb
refactor(css): use --bs-body-color for #212121
machikoyasuda May 31, 2023
d00e01e
refactor(colors): add calitp-green-4, orange, red, purple
machikoyasuda May 31, 2023
0bdfb9a
refactor(css): add cyan-1
machikoyasuda May 31, 2023
9005fef
fix: update colors from Segacy
machikoyasuda Jun 2, 2023
c556508
fix: green link is now green-5
machikoyasuda Jun 2, 2023
0d812eb
fix: number 4 is purple 4
machikoyasuda Jun 2, 2023
10eeb7f
fix: bottom 2 boxes are slate-5
machikoyasuda Jun 2, 2023
abda7f2
refactor(css): convert hex to rgb
machikoyasuda Jun 2, 2023
8362cb2
refactor: use cyan-1 var
machikoyasuda Jun 2, 2023
81b0962
fix(nav): no color needed here
machikoyasuda Jun 2, 2023
e942af0
fix(navbar): nav bar in mobile had a gap
machikoyasuda Jun 2, 2023
84f1525
refactor(css): use vars for type
machikoyasuda Jun 2, 2023
7c6dc56
refactor(type): use bootstrap h styles, override if different
machikoyasuda Jun 2, 2023
5428fd7
fix: font size fixes
machikoyasuda Jun 2, 2023
b56f22e
fix(navbar): bring back box shadow bottom
machikoyasuda Jun 5, 2023
a606c4a
fix(navbar): wrong color, wrong place navbar
machikoyasuda Jun 5, 2023
c72250b
Refactor: Use CSS Variables for colors, font family (#149)
machikoyasuda Jun 5, 2023
114211d
chore: rebase
machikoyasuda Jun 5, 2023
41d2b42
chore: rebase
machikoyasuda Jun 5, 2023
2375bc4
fix(home): add padding y around h3
machikoyasuda Jun 2, 2023
e6e6da6
chore: fix terrible rebase job
machikoyasuda Jun 5, 2023
67b6280
feat(press): design the press layout
machikoyasuda Jun 5, 2023
c1537bb
fix: format underline
machikoyasuda Jun 1, 2023
e433ae3
chore: rebase
machikoyasuda Jun 5, 2023
454eb0e
Home: Bottom two components (#152)
machikoyasuda Jun 5, 2023
f02004f
feat(index): first pass at tabbed interface for Initiatives
machikoyasuda Jun 5, 2023
8f10876
chore: rebase fix
machikoyasuda May 18, 2023
8f530f0
chore: delete extraneous css
machikoyasuda Jun 5, 2023
42ef510
chore: formatting
machikoyasuda May 18, 2023
e2116c0
refactor: put into includes
machikoyasuda May 18, 2023
bf33993
chore: delete rhombus imgs
machikoyasuda May 18, 2023
b40721b
refactor: use datafile and template instead
machikoyasuda May 23, 2023
f7fe731
fix(init): white links
machikoyasuda May 23, 2023
e39b46a
fix(init): missing rel
machikoyasuda May 23, 2023
1ec380a
feat(init): show press/resources for each tag
machikoyasuda May 23, 2023
dfe1fa1
feat: only show the top 2
machikoyasuda May 23, 2023
e50354f
refactor(colors): use css color vars
machikoyasuda Jun 5, 2023
663ac49
feat(buttons): add buttons
machikoyasuda Jun 1, 2023
316b984
feat: add dashed line
machikoyasuda Jun 1, 2023
8eb6215
fix: update colors
machikoyasuda Jun 5, 2023
15ab015
fix: rebase
machikoyasuda Jun 5, 2023
803a3a3
refactor(css): rename details to initiatives
machikoyasuda Jun 2, 2023
c66dd0c
refactor(initiatives): use variable to set background, use css vars
machikoyasuda Jun 2, 2023
29e6d78
refactor(css): use more variables
machikoyasuda Jun 5, 2023
4ca2776
fix: delete redundant line
machikoyasuda Jun 5, 2023
903138d
refactor(css): use rems for font, border
machikoyasuda Jun 5, 2023
a47cb4a
fix(home): bold links
machikoyasuda Jun 5, 2023
8642b8c
fix: rebase
machikoyasuda Jun 5, 2023
41aa590
refactor(css): use variables
machikoyasuda Jun 5, 2023
59d995a
chore: fix typo
machikoyasuda Jun 5, 2023
d16a925
refactor(css): variablize
machikoyasuda Jun 5, 2023
9b1eb75
feat(initiatives): add rhombus
machikoyasuda Jun 6, 2023
f97c3f8
Update src/_data/initiatives.yml
machikoyasuda Jun 6, 2023
49b6ab4
refactor(css): use class rather than underline
machikoyasuda Jun 6, 2023
00e46e6
Design: Press page (#150)
machikoyasuda Jun 6, 2023
b8b1d94
Homepage - Initiatives tabs (#142)
machikoyasuda Jun 6, 2023
c069abc
feat: css for resources, press page, minus filters
machikoyasuda Jun 6, 2023
52ca679
feat(css): text styling for press
machikoyasuda Jun 6, 2023
c351cfb
feat(css): text updates for resources
machikoyasuda Jun 5, 2023
968e77e
feat(css): variablize bg colors
machikoyasuda Jun 5, 2023
6de586e
refactor(templates): refactor press/resources article list into 2 tem…
machikoyasuda Jun 6, 2023
93d0fc1
fix(details): hide arrow
machikoyasuda Jun 6, 2023
46f198a
feat(rhombus): add rhombus to Press and Resources
machikoyasuda Jun 6, 2023
5b6607c
refactor: explicitly include iitems
machikoyasuda Jun 6, 2023
f993669
refactor: use svg include
machikoyasuda Jun 6, 2023
1ae56e2
fix(rhombus): make rhombus desktop only
machikoyasuda Jun 6, 2023
800282a
fix(rhombus): rhombus is larger screen only
machikoyasuda Jun 6, 2023
ac0db1b
fix(article): explicitly pass item into article
machikoyasuda Jun 6, 2023
c77d0b7
Resources, Press pages (#151)
machikoyasuda Jun 6, 2023
352d270
fix(articles): remove Show More for now
machikoyasuda Jun 6, 2023
37de40e
feat(home): convert bottom 2 components to rhombus on desktop
machikoyasuda Jun 6, 2023
052ae8f
Remove Show More for now (#154)
machikoyasuda Jun 6, 2023
514783c
fix: bold links for consistency
machikoyasuda Jun 6, 2023
92422e3
fix(home): aligning corners
machikoyasuda Jun 6, 2023
3c45468
fix(header): fix home and reach links
machikoyasuda Jun 7, 2023
68a6c4c
fix(resources): remove merchant service charge
machikoyasuda Jun 7, 2023
d9cf0c5
fix(index): the rounded no longer necessary, taken care of by rhombus…
machikoyasuda Jun 7, 2023
bd7ad29
Fix: Remove merchant service charge (#160)
machikoyasuda Jun 7, 2023
3e7312b
Fix header's home and reach out links (#159)
machikoyasuda Jun 7, 2023
7f070e3
Update src/index.html
machikoyasuda Jun 7, 2023
f0db079
Home Page: Convert bottom 2 components to Rhombus on Desktop (#155)
machikoyasuda Jun 7, 2023
cc9470f
refactor(css): .big is the same as .fs-5
machikoyasuda Jun 6, 2023
762b1af
refactor(css): delete unused class
machikoyasuda Jun 6, 2023
01e5eb4
refactor(css): replace width:100 with w-100
machikoyasuda Jun 6, 2023
1fe8113
chore(css): 1 line between classes
machikoyasuda Jun 6, 2023
b0a81da
fix: border bottom
machikoyasuda Jun 6, 2023
b8f5517
fix(initiatives): initative spacing fixes
machikoyasuda Jun 7, 2023
f65c7f9
fix(home): homepage spacing fixes
machikoyasuda Jun 7, 2023
8205a62
chore: clean up unused class
machikoyasuda Jun 7, 2023
696f8d6
refactor(css): remove unused class, use utility
machikoyasuda Jun 7, 2023
8e58fdf
refactor(css): make rainbow list generic
machikoyasuda Jun 7, 2023
a2cbb88
fix(home): h2 spacing
machikoyasuda Jun 7, 2023
3d45cc1
fix(home): last railway sm img
machikoyasuda Jun 7, 2023
a109513
refactor(home): delete all #deck css, use classes instead
machikoyasuda Jun 7, 2023
c2d3ffe
refactor(css): font size to rem
machikoyasuda Jun 7, 2023
d9f017f
fix: not dashed
machikoyasuda Jun 7, 2023
b458f9b
feat(css): link styles
machikoyasuda Jun 7, 2023
93dc996
fix(footer): link styles
machikoyasuda Jun 7, 2023
c1ae555
fix(header): header link classes
machikoyasuda Jun 7, 2023
7116e00
fix(home): create .hero-header class
machikoyasuda Jun 7, 2023
b05d0c8
fix(home): set max width on heroheader
machikoyasuda Jun 7, 2023
e1fd579
feat: introduce tab that shows articles based on tag
angela-tran Jun 7, 2023
2b54c3b
feat: add other tabs that pass in a tag
angela-tran Jun 7, 2023
d58c92a
refactor: hide the "all" tab for now
angela-tran Jun 8, 2023
6eb4642
Refactor CSS, Part 1 (#156)
machikoyasuda Jun 8, 2023
98c55e5
Feat: article tabs (#163)
angela-tran Jun 8, 2023
b7d0663
feat: add Javascript for toggling a pill off to hide its tab
angela-tran Jun 8, 2023
6553eab
feat: make sure selected state is set correctly on arrow key selection
angela-tran Jun 8, 2023
64427bf
feat: logic to hide and show the "all" tab
angela-tran Jun 8, 2023
83e0e5a
refactor: manage pill logic as actual Javascript file rather than HTML
angela-tran Jun 8, 2023
845d5c0
Feat: toggling pills (#164)
angela-tran Jun 8, 2023
96fd614
refactor: generate pills and tabs based on data file for press tags
angela-tran Jun 8, 2023
18c5295
refactor: generate pills and tabs based on data file for resource tags
angela-tran Jun 8, 2023
ee60131
Refactor: tag data (#165)
angela-tran Jun 8, 2023
7bdd74c
refactor(home): extract out Initiatives pills classes
machikoyasuda Jun 8, 2023
a603745
feat(pills): add styled pills to Resources and Pills
machikoyasuda Jun 8, 2023
f438750
fix: undo
machikoyasuda Jun 8, 2023
2cd23a5
refactor(pills): declare variable
machikoyasuda Jun 8, 2023
dc4da76
fix(mobile): add flex-shrink, flex-row for responsive pills
machikoyasuda Jun 8, 2023
9a4af58
CSS for Pills on Resources and Press (#166)
machikoyasuda Jun 8, 2023
5ed20ef
refactor(footer): use flexbox for footer, not css grid
machikoyasuda Jun 7, 2023
b861611
refactor(footer): use col-md-auto and row row-column for mobile
machikoyasuda Jun 8, 2023
9356e18
Refactor: Use flexbox for footer, not css grid (#167)
machikoyasuda Jun 8, 2023
d9d88dc
style: match padding for pills as shown in Figma
angela-tran Jun 12, 2023
97a5a98
Fix: pill padding (#175)
angela-tran Jun 12, 2023
9d59176
fix(home): rainbow list padding left is 0
machikoyasuda Jun 12, 2023
7f898d3
chore(pre-commit): autoupdate hooks
pre-commit-ci[bot] Jun 12, 2023
dfb3d37
fix(rhombus): fix rhombus Safari but on mobile widths
machikoyasuda Jun 12, 2023
3076ee1
refactor: move filtering logic to initial assignment of items
angela-tran Jun 12, 2023
ddfa93d
Home: Rainbow list padding left is 0 (#181)
machikoyasuda Jun 12, 2023
d2eca9c
Refactor: avoid generating empty sections (#184)
angela-tran Jun 12, 2023
0280542
fix(safari): this partially fixes rhombus bug, not for links/clicking
machikoyasuda Jun 12, 2023
c37cf75
chore(pre-commit): autoupdate hooks (#182)
thekaveman Jun 13, 2023
d3da2d2
Fix: fix rhombus Safari issue on mobile widths (#183)
machikoyasuda Jun 14, 2023
269fb28
fix(rhombus): use clip-path svg with rounded corners for all pages
machikoyasuda Jun 14, 2023
bcde93a
fix: no longer necessary
machikoyasuda Jun 14, 2023
43a915e
fix: remove box-shadow class
machikoyasuda Jun 14, 2023
bbcc7e0
fix(home): bottom 2 rhombus alignment fix
machikoyasuda Jun 14, 2023
faddfa9
refactor: turn clipped-shadow into class
machikoyasuda Jun 14, 2023
c61ce1b
fix: add mt-5 to Press outer div to match the one on Resource h2
angela-tran Jun 14, 2023
24b96b7
fix: make Press links take up full column
angela-tran Jun 14, 2023
1b2b265
fix: remove custom link styling on Press Release layout
angela-tran Jun 14, 2023
ce830ef
fix: make space above and below line break the same
angela-tran Jun 14, 2023
aa72572
fix: make space above and below line break 40px (same as Figma)
angela-tran Jun 14, 2023
d98fdd7
fix(home): manage height with align-content-stretch; flip shapes
machikoyasuda Jun 14, 2023
dbe4b68
Fix: Press page CSS (#189)
angela-tran Jun 14, 2023
12b98ff
Fix: Press Release CSS, Resources line break (#190)
angela-tran Jun 14, 2023
84cacc2
fix(mobile): mobile nav link sizing is off, text now vertically centered
machikoyasuda Jun 14, 2023
78bedba
fix: adjust offsets on initiatives to make text more centered
angela-tran Jun 14, 2023
7a14bea
fix(home): align the h3s of the 2 rhombuses; add 24px margin bottom f…
machikoyasuda Jun 14, 2023
b1d0d57
fix(mobile): mobile nav link sizing is off, text now vertically cente…
machikoyasuda Jun 14, 2023
220e120
fix: press, resources - add margin-bottom 8px to h1s
machikoyasuda Jun 14, 2023
0bbb8b1
fix: press, resources - space between body text and filters is 32px
machikoyasuda Jun 14, 2023
1185af8
Fix: center Initiatives content (#193)
angela-tran Jun 14, 2023
1df6a0a
fix: press, resources - on desktop: left-align rhombus text to links
machikoyasuda Jun 14, 2023
9984e09
Fix: Fix Desktop rhombus bug on Safari (#188)
machikoyasuda Jun 14, 2023
2627fa2
Fix: Home - Rhombus padding (#192)
machikoyasuda Jun 14, 2023
28538cf
chore: reorder classes, col before margin/padding
machikoyasuda Jun 14, 2023
c7b4201
chore(press): remove rounded.html file and call
machikoyasuda Jun 14, 2023
dfce22b
fix(navbar): link to about section
thekaveman Jun 14, 2023
c54163e
fix: ensure about section is not obscured by navbar
thekaveman Jun 14, 2023
395040e
Fix: Make About link jump to About section (#197)
thekaveman Jun 14, 2023
80c1be9
refactor: use margin-bottom to space out sections within initiatives
angela-tran Jun 14, 2023
17f0821
fix: remove padding that was adding extra space on small screens
angela-tran Jun 14, 2023
1f134a5
style: make space between sections 28px on mobile, 40px on desktop
angela-tran Jun 14, 2023
d3ba993
refactor: replace initiatives-specific class with general margin classes
angela-tran Jun 14, 2023
7bfdf45
fix: press, resources - correct desktop/mobile padding-Y, padding-X a…
machikoyasuda Jun 14, 2023
e172a47
Fix: initiatives sections spacing (#194)
angela-tran Jun 14, 2023
e685bb8
fix: initiative press links were missing d-block class
angela-tran Jun 14, 2023
54939cc
fix(mobile): press, resources - widen col, reduce padding top/bottom …
machikoyasuda Jun 14, 2023
80e801d
fix(footer): footer link hover color is gray-2
machikoyasuda Jun 15, 2023
886dba6
fix(press): desktop - when the page is too short, make sure footer is…
machikoyasuda Jun 15, 2023
86910d1
fix(footer): desktop/mobile - desktop height is 39px. mobile height i…
machikoyasuda Jun 15, 2023
4b7ecad
Fix: spacing for Initiatives press links (#198)
angela-tran Jun 15, 2023
47e620c
fix(initiatives): don't expand pills on mobile narrow widths/2-lines
machikoyasuda Jun 15, 2023
6e105ae
fix(initiatives): mobile - padding x is 32px
machikoyasuda Jun 15, 2023
4349c2e
fix(initiatives): mobile - tighten padding above/below image
machikoyasuda Jun 15, 2023
b424690
Fix: Press, Resources page - Spacing (#195)
machikoyasuda Jun 15, 2023
f474e24
fix(resources): Sentence case for Case studies, Fact sheets & overviews
machikoyasuda Jun 15, 2023
6e318be
fix: press, resources - use edited headlines
machikoyasuda Jun 15, 2023
e91b5dd
chore: smart quotation marks, please.
machikoyasuda Jun 15, 2023
5f5ea79
feat(press): new gtfs press release
machikoyasuda Jun 15, 2023
fb7c7d3
Fix: Footer issues (#199)
machikoyasuda Jun 15, 2023
1f03136
Press: Add new GTFS press release (#202)
machikoyasuda Jun 15, 2023
fbe1ac4
Fix: Home - Mobile: Initiatives (#200)
machikoyasuda Jun 15, 2023
49820e1
fix(initiatives): smart quote
machikoyasuda Jun 15, 2023
0d8cee4
Fix: Copy edits (#201)
machikoyasuda Jun 15, 2023
9c1cb4b
fix(home): hide button on Benefits, GTFS; add text for Contactless Pa…
machikoyasuda Jul 31, 2023
6cb6996
fix(press): typo
machikoyasuda Jul 31, 2023
ba2848c
feat(press): add Outlet data to press item, show it on press page
machikoyasuda Jul 31, 2023
1bc6641
Fix: typo (#216)
machikoyasuda Jul 31, 2023
927bec6
Fix: Initiatives section (#215)
machikoyasuda Jul 31, 2023
1fe3c9b
feat: dependabot version updates
thekaveman Jul 26, 2023
428559f
Feat: dependabot version updates (#211)
thekaveman Jul 31, 2023
27ea837
fix(ci): update default branch
thekaveman Jul 31, 2023
eef7f79
Fix: broken GitHub Action (#223)
thekaveman Jul 31, 2023
4de73e4
chore(deps): bump actions/checkout from 2 to 3
dependabot[bot] Jul 31, 2023
1495217
chore(deps): bump peter-evans/create-or-update-comment from 1 to 3
dependabot[bot] Jul 31, 2023
00a38f9
chore(deps): bump rubyzip from 2.3.0 to 2.3.2
dependabot[bot] Jul 31, 2023
21da1e5
chore(deps): bump actions/checkout from 2 to 3 (#218)
thekaveman Jul 31, 2023
d9f428f
chore(deps): bump webrick from 1.7.0 to 1.8.1
dependabot[bot] Jul 31, 2023
dd165da
chore(deps): bump peter-evans/create-or-update-comment from 1 to 3 (#…
thekaveman Jul 31, 2023
189ec73
chore(deps): bump webrick from 1.7.0 to 1.8.1 (#220)
thekaveman Jul 31, 2023
c540bfd
chore(deps): bump rubyzip from 2.3.0 to 2.3.2 (#221)
thekaveman Jul 31, 2023
bd81456
chore(deps): bump jekyll from 4.2.0 to 4.3.2
dependabot[bot] Jul 31, 2023
d81af94
fix(ci): update ruby version 2 -> 3
thekaveman Jul 31, 2023
9a31954
chore(deps): bump jekyll from 4.2.0 to 4.3.2 (#222)
thekaveman Jul 31, 2023
ee81726
Update src/_press/cal-itp-payments-data-dashboard.md
machikoyasuda Aug 1, 2023
a16d2de
Update src/_press/cal-itp-gtfs-schedule-validator.md
machikoyasuda Aug 1, 2023
02c8f22
Update src/_press/cal-itp-payments-data-dashboard.md
machikoyasuda Aug 2, 2023
dc8ab6e
Press Page: Add Outlet data to press item, show it on press page (#217)
machikoyasuda Aug 2, 2023
2f474e8
fix(press): Mobility Data, not MobilityData.org
machikoyasuda Aug 3, 2023
80c8226
chore(resources): add 2 benefits resources
machikoyasuda Aug 3, 2023
054528c
chore(resources): add 2 resources for gtfs
machikoyasuda Aug 3, 2023
2a891cd
fix(resources): don't show outlet | for resources
machikoyasuda Aug 3, 2023
849b848
chore: remove gemfile.lock changes
machikoyasuda Aug 3, 2023
4e2ab72
fix(resources): remove old Benefits deck
machikoyasuda Aug 3, 2023
ac34818
fix(press-resources): correct formatting for all the dates
machikoyasuda Aug 3, 2023
2551b52
fix(resources): remove Benefits deck actually
machikoyasuda Aug 3, 2023
76764df
feat(press): add 6 press releases
machikoyasuda Aug 3, 2023
fdade40
feat(tags): add Data Plans tag
machikoyasuda Aug 3, 2023
38ee6fa
fix(typo): correct date
machikoyasuda Aug 3, 2023
c9b8dcc
fix: remove data plans from resources for now
machikoyasuda Aug 4, 2023
b7160fe
fix: delete another duplicate
machikoyasuda Aug 4, 2023
297f298
fix: replace .yml with .md
machikoyasuda Aug 4, 2023
bc70133
Add new Press, Resources and Data Plans tag (#224)
machikoyasuda Aug 4, 2023
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: 0 additions & 3 deletions .devcontainer/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@ services:
context: ..
dockerfile: .devcontainer/Dockerfile
command: sleep infinity
ports:
- "4000"
- "35729:35729"
volumes:
- ..:/usr/src/calitp
34 changes: 19 additions & 15 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,24 @@
"service": "site",
"workspaceFolder": "/usr/src/calitp",
"postAttachCommand": ["/bin/bash", ".devcontainer/postAttach.sh"],
"settings": {
"terminal.integrated.defaultProfile.linux": "bash",
"terminal.integrated.profiles.linux": {
"bash": {
"path": "/bin/bash"
}
"customizations": {
"vscode": {
"settings": {
"terminal.integrated.defaultProfile.linux": "bash",
"terminal.integrated.profiles.linux": {
"bash": {
"path": "/bin/bash"
}
}
},
"extensions": [
"bungcip.better-toml",
"eamodio.gitlens",
"esbenp.prettier-vscode",
"mhutchie.git-graph",
"redhat.vscode-xml",
"sissel.shopify-liquid"
]
}
},
"extensions": [
"bungcip.better-toml",
"eamodio.gitlens",
"esbenp.prettier-vscode",
"mhutchie.git-graph",
"redhat.vscode-xml",
"sissel.shopify-liquid"
]
}
}
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# default to web-admin team
* @cal-itp/web-admin
27 changes: 27 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "bundler" # See documentation for possible values
directory: "/" # Location of Gemfile
schedule:
interval: "daily"
commit-message:
prefix: "chore"
include: "scope"
labels:
- "dependencies"
- package-ecosystem: "github-actions"
# Workflow files stored in the
# default location of `.github/workflows`
directory: "/"
schedule:
interval: "daily"
commit-message:
prefix: "chore"
include: "scope"
labels:
- "dependencies"
10 changes: 5 additions & 5 deletions .github/workflows/dependabot-differ.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
if: contains(github.event.pull_request.labels.*.name, 'dependencies') # See https://git.io/JsVv1
steps:
- name: Checkout Pull Request Branch
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
submodules: true

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 3.1
bundler-cache: true

- name: Build Pull Request Version of Website
Expand All @@ -31,9 +31,9 @@ jobs:
mv _site _site-pr

- name: Checkout Default Branch
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: core
ref: staging
clean: false
submodules: true

Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
echo "::set-output name=pr-comment::$PR_COMMENT"

- name: Comment on the Pull Request
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v3
with:
issue-number: ${{ github.event.pull_request.number }}
body: ${{ steps.site-diff.outputs.pr-comment }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.bundle
.netlify
_site
.DS_Store
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ default_stages:

repos:
- repo: https://github.com/compilerla/conventional-pre-commit
rev: v2.2.0
rev: v2.3.0
hooks:
- id: conventional-pre-commit
stages: [commit-msg]
Expand Down
11 changes: 3 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"[javascript]": {
"editor.tabSize": 2
},
"[json]": {
"editor.tabSize": 2
},
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.tabSize": 2,
"files.associations": {
"*.html": "liquid"
}
}
133 changes: 0 additions & 133 deletions CONDUCT.md

This file was deleted.

9 changes: 4 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
source "https://rubygems.org"

gem "jekyll", "~> 4.2.0"
gem "rubyzip", "~> 2.3"
gem "webrick", "~> 1.7"
source "https://rubygems.org"

gem "jekyll", "~> 4.3.2"
gem "rubyzip", "~> 2.3"
Loading