Skip to content

Commit 79f4d05

Browse files
authored
Merge branch 'gh-pages' into mrchrisw/exclude-node_modules
2 parents abdaad0 + b20a465 commit 79f4d05

25 files changed

Lines changed: 437 additions & 29 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ assets/vendor/**/*.txt
1111
assets/vendor/bootstrap-sass/assets/javascripts/
1212
.sass-cache
1313
.env
14+
.jekyll-metadata
1415
tmp/

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ source 'https://rubygems.org'
44

55
gem 'github-pages'
66
gem 'jekyll-octicons'
7+
# need lazy-load support
8+
gem 'jekyll-avatar', '>= 0.6.0'
79

810
group :development, :test do
911
gem 'html-proofer'

_data/civic_hackers.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ Civic Hackers:
125125
- smartchicago
126126
- smcgov
127127
- spaceadvocates
128-
- spendb
129128
- stadtlandcode
130129
- statedecoded
131130
- sunlightlabs

_data/governments.yml

Lines changed: 53 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Australia:
2222
- data61
2323
- datagovau
2424
- dpipwe
25+
- dssgovaus
2526
- envris
2627
- Fire-and-Rescue-NSW
2728
- gccgisteam
@@ -51,6 +52,7 @@ Australia:
5152

5253
Belgium:
5354
- belgianpolice
55+
- CIRB
5456
- Fedict
5557
- inbo
5658
- onroerenderfgoed
@@ -87,7 +89,6 @@ Brazil:
8789
- prodest
8890
- secom-tocantins
8991
- secultce
90-
- SerraWeb
9192
- tcers
9293
- tisorocaba
9394
- tre-pa
@@ -116,17 +117,19 @@ Canada:
116117
- ECCC-MSC
117118
- electionsquebec
118119
- fgpv-vpgf
120+
- gc-proto
119121
- GCTC-NTGC
120122
- gctools-outilsgc
121123
- GeoCanViz
122124
- GNWT
123125
- HIFIS
124126
- infra-geo-ouverte
125127
- MC-MBO-WebPublishingTeam
128+
- MetPX
126129
- nrc-cnrc
127130
- NRCan
128131
- nsgov
129-
- OntarioDigital
132+
- ongov
130133
- open-data
131134
- phac-nml
132135
- pspc-spac
@@ -144,9 +147,16 @@ Catalonia:
144147
- AjuntamentdeSabadell
145148
- AjuntamentdeSantCugat
146149
- AjuntamentdeTerrassa
150+
- AjuntamentDeMataro
151+
- AjuntamentdeReus
152+
- AjuntamentDeGava
153+
- AjuntamentdeCalafell
154+
- AjMalgrat
155+
- diputacioBCN
147156
- gencat
148157
- HospitaletDeLlobregat
149158
- projectestac
159+
- vilanovailageltru
150160

151161
Chile:
152162
- e-gob
@@ -198,19 +208,32 @@ Finland:
198208

199209
France:
200210
- afimb
211+
- AlsaceDigitale
201212
- ANSSI-FR
202213
- ApieFrance
214+
- betagouv
203215
- communaute-cimi
216+
- culturecommunication
204217
- DGFiP
205218
- diplomatiegouvfr
206219
- disic
220+
- entrepreneur-interet-general
207221
- erasme
208222
- etalab
223+
- Inist-CNRS
224+
- SocieteNumerique
225+
- lutece-secteur-public
226+
- MINAGRI-INITIAL
227+
- MTES-MCT
228+
- MinistereSupRecherche
209229
- nanterre
230+
- nantesmetropole
210231
- polewebmaedi
211232
- ProgrammeVitam
212-
- sgmap
233+
- region-bretagne
213234
- sgmap-agd
235+
- SocialGouv
236+
- strasbourg
214237

215238
French Polynesia:
216239
- sipf
@@ -254,7 +277,7 @@ Japan:
254277
- codefornamie
255278
- gsi-cyberjapan
256279
- nhohq
257-
- nims-library
280+
- nims-dpfc
258281
- wakayama-pref-org
259282

260283
Jersey:
@@ -340,6 +363,9 @@ Poland:
340363
Portugal:
341364
- amagovpt
342365

366+
Republic of Korea:
367+
- molit-korea
368+
343369
Romania:
344370
- gov-ithub
345371
- govro
@@ -356,25 +382,36 @@ South Africa:
356382
- eddZA
357383

358384
Spain:
385+
- AjuntamentdeCastello
359386
- AyuntamientoMadrid
387+
- castilla-lamancha
360388
- ctt-gob-es
389+
- ErabakiPamplona
361390
- GobiernoLaRioja
362391
- icane
363392
- JuntaDeAndalucia
364-
393+
365394
Sweden:
395+
- arbetsformedlingen
366396
- domstol
367397
- gbif-sweden
398+
- Helsingborg
399+
- helsingborg-stad
368400
- kungbib
401+
- Lantmateriet
369402
- libris
370403
- lldd
371404
- malmostad
372405
- mtmse
406+
- regionhalland
407+
- regionostergotland
373408
- riksarkivet
374409
- rinfo
375410
- statens-maritima-museer
411+
- Sundsvallskommun
376412
- swedishpensionsagency
377413
- The-Municipality-of-Staffanstorp
414+
- Vastra-Gotalandsregionen
378415

379416
Switzerland:
380417
- alv-ch
@@ -395,6 +432,7 @@ The Netherlands:
395432
- Geonovum
396433
- Haarlem
397434
- IenS-Velsen
435+
- MinBZK
398436
- MinELenI
399437
- Pleio
400438
- provinciegroningen
@@ -422,12 +460,12 @@ U.K. Central:
422460
- dvla
423461
- dvsa
424462
- GCHQ
425-
- gds-attic
426463
- gds-dead
427464
- gds-operations
428465
- guidance-guarantee-programme
429466
- hmcts
430467
- hmrc
468+
- informatics-lab
431469
- insolvencyservice
432470
- intellectual-property-office
433471
- IQuOD
@@ -438,13 +476,13 @@ U.K. Central:
438476
- landregistry-ops
439477
- lgss
440478
- LocalGovDigital
441-
- met-office-lab
442479
- MetOffice
443480
- MetOfficeSpaceApps
444481
- metomi
445482
- ministryofjustice
446483
- naouk
447484
- nationalarchives
485+
- NationalCrimeAgency
448486
- OfqualGovUK
449487
- ONSdigital
450488
- openglasgow
@@ -588,6 +626,7 @@ U.S. Federal:
588626
- CA-CST-Library
589627
- CA-CST-SII
590628
- ccmc
629+
- CDCgov
591630
- cfpb
592631
- cmsgov
593632
- commercedataservice
@@ -606,6 +645,7 @@ U.S. Federal:
606645
- eregs
607646
- fcc
608647
- fda
648+
- fecgov
609649
- Federal-Aviation-Administration
610650
- federaltradecommission
611651
- fedspendingtransparency
@@ -668,6 +708,7 @@ U.S. Federal:
668708
- sbstusa
669709
- SelectUSA
670710
- SERVIR
711+
- SSAgov
671712
- state-hiu
672713
- sunpy
673714
- us-bea
@@ -710,6 +751,7 @@ U.S. Federal:
710751
- USPTO
711752
- USSBA
712753
- usstatedept
754+
- ustaxcourt
713755
- VHAINNOVATIONS
714756
- virtual-world-framework
715757
- visionworkbench
@@ -723,6 +765,7 @@ U.S. Military and Intelligence:
723765
- info-sharing-environment
724766
- NationalSecurityAgency
725767
- ngageoint
768+
- nsacyber
726769
- project-interoperability
727770
- screamlab
728771
- shareandprotect
@@ -794,13 +837,13 @@ U.S. States:
794837
U.S. Tribal Nations:
795838
- coquille-indian-tribe
796839
- osage-nation
797-
840+
798841
U.S. Local Law Enforcement:
799842
- SanDiegoCountySheriff
800-
843+
801844
Ukraine:
802845
- openprocurement
803-
846+
804847
Uruguay:
805848
- gubuy
806849

_data/research.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Government funded research - must have a government email/domain to be listed
22

3+
Kenya:
4+
- Multimedia-University-of-Kenya
5+
36
New Zealand Crown Research Institutes:
47
- AgResearch
58
- niwa
@@ -99,7 +102,6 @@ U.S. Research Labs:
99102
- reflectometry
100103
- rose-compiler
101104
- sandialabs
102-
- scalability-llnl
103105
- scattering
104106
- seed-platform
105107
- sim-x

_includes/footer.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
</footer>
2626

2727

28-
<script src="/assets/vendor/anchor-js/anchor.min.js"></script>
29-
<script src="/assets/vendor/jquery/dist/jquery.min.js"></script>
28+
<script src="{{ "/assets/vendor/anchor-js/anchor.min.js" | relative_url}}"></script>
29+
<script src="{{ "/assets/vendor/jquery/dist/jquery.min.js" | relative_url}}"></script>
3030
<script>anchors.add('.org-type h4');</script>
3131
{% if page.url == "/community/" %}
32-
<script src="/assets/js/community.js"></script>
32+
<script src="{{ "/assets/js/community.js" | relative_url}}"></script>
3333
{% elsif page.url == "/" %}
34-
<script src="/assets/js/home.js"></script>
34+
<script src="{{ "/assets/js/home.js" | relative_url}}"></script>
3535
{% endif %}
3636
</body>
3737
</html>

_includes/form.html

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<form id="eloquaForm" name="fedramp_form" method="post" action="https://s{{ page.form-id }}.t.eloqua.com/e/f2" novalidate>
2+
<input value="fedramp_form" type="hidden" name="elqFormName">
3+
<input value="{{ page.form-id }}" type="hidden" name="elqSiteId">
4+
<input name="elqCampaignId" type="hidden">
5+
6+
<div class="mb-3">
7+
<label for="field0" class="d-inline-block mb-1">
8+
Full name
9+
</label>
10+
<input id="field0" name="fullName1" type="text" class="form-control form-control-lg input-block" placeholder="First and last name" required>
11+
<span class="form-control-invalid-text">Your full name is required.</span>
12+
</div>
13+
14+
<div class="mb-3">
15+
<label for="field1" class="d-inline-block mb-1">
16+
Email address
17+
</label>
18+
<input id="field1" name="emailAddress" type="email" class="form-control form-control-lg input-block" placeholder="you@example.com" required>
19+
<span class="form-control-invalid-text">A valid email address is required.</span>
20+
</div>
21+
22+
<div class="mb-3">
23+
<label for="field2" class="d-inline-block mb-1">
24+
Company/Agency
25+
</label>
26+
<input id="field2" name="company" type="text" class="form-control form-control-lg input-block" placeholder="Acme, Inc" required>
27+
<span class="form-control-invalid-text">A valid company name is required.</span>
28+
</div>
29+
30+
<div class="mb-3">
31+
<label for="field5" class="d-inline-block mb-1">
32+
What can we help you with?
33+
</label>
34+
<textarea id="field5" name="contactComments" type="text" class="form-control form-control-lg input-block" rows="4" placeholder="Tell us how we can help. For support questions, head to github.com/contact" maxlength="1000" required></textarea>
35+
<span class="form-control-invalid-text">A valid comment is required.</span>
36+
</div>
37+
38+
<input id="country" type="hidden" name="country" value="">
39+
<input id="subdivision" type="hidden" name="subdivision" value="">
40+
<input id="city" type="hidden" name="city" value="">
41+
<input type="hidden" name="elqCustomerGUID" value="">
42+
<input type="hidden" name="elqCookieWrite" value="0">
43+
<input id="sfcampaignid" type="hidden" name="sfcampaignid" value="{{ page.sf-campaign-id }}">
44+
<input id="source" type="hidden" name="source" value="{{ page.campaign }}">
45+
46+
<button type="submit" class="btn btn-primary btn-large f4">Submit</button>
47+
</form>

_includes/header.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<link rel="shortcut icon" href="/assets/img/favicon.ico" type="image/x-icon">
8-
<link rel="stylesheet" href="/assets/css/style.css">
7+
<link rel="shortcut icon" href="{{ "/assets/img/favicon.ico" | relative_url }}" type="image/x-icon">
8+
<link rel="stylesheet" type="text/css" href="{{ "/assets/css/style.css" | relative_url }}">
99
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,700,700i" rel="stylesheet">
1010
{% include analytics.html %}
1111
{% seo %}
@@ -16,12 +16,12 @@
1616
<div class="page-header pt-4 pb-5">
1717
<div class="container-lg">
1818
<div class="text-center">
19-
<a href="/"><img class="logo py-3" src="/assets/img/logomark.svg" alt="GitHub and Government"></a>
19+
<a href="{{ "/" | relative_url}}"><img class="logo py-3" src="{{ "/assets/img/logomark.svg" | relative_url}}" alt="GitHub and Government"></a>
2020
<ul>
21-
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="/community/" class="text-white">Who's using GitHub</a></li>
21+
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="{{ "/community/" | relative_url}}" class="text-white">Who's using GitHub</a></li>
2222
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="https://github.com/government/welcome#readme" class="text-white">Peer Group</a></li>
23-
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="/accessibility" class="text-white">Accessibility</a></li>
24-
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="/#contact-a-human" class="text-white">Contact</a></li>
23+
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="{{ "/accessibility" | relative_url}}" class="text-white">Accessibility</a></li>
24+
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="{{ "/#contact-a-human" | relative_url}}" class="text-white">Contact</a></li>
2525
</ul>
2626
</div>
2727
</div>

_includes/org-table.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h3 class="alt-h3 mb-3" id="{{ slug }}">{{ type_hash[0] }} ({{ type_hash[1] | si
2020

2121
<div class="col-sm-3 float-left org">
2222
<a href="https://github.com/{{ org }}" title="{{ org }}" class="border d-block text-center px-2 py-4 mb-4">
23-
{% avatar user=org size=60 %}
23+
{% avatar user=org size=60 lazy=true %}
2424
<div class="org-name text-small">
2525
@{{ org }}
2626
</div>

0 commit comments

Comments
 (0)