Skip to content

Commit 0bc0c8d

Browse files
myShoggothmyShoggoth
authored
Merge branch 'master' into bug-reports
2 parents 5be374f + 879361b commit 0bc0c8d

File tree

37 files changed

+1466
-370
lines changed

37 files changed

+1466
-370
lines changed

‎docs/affiliates/about/index.html

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,10 @@ <h2>Affiliated Projects</h2>
399399
/static/images/sponsors/iohk/iohk-200.png 200w,
400400
/static/images/sponsors/iohk/iohk-400.png 400w,
401401
/static/images/sponsors/iohk/iohk-683.png 683w"></a>
402+
<a href="https://digitalasset.com/" target="_blank" class="block w-36 m-4"><img alt="Digital Asset" src="../../static/images/sponsors/digital-asset/digital-asset-logo-light.png" srcset="../../static/images/sponsors/digital-asset/digital-asset-logo-light.png"></a>
403+
</div>
404+
405+
<div class="mt-16 flex flex-wrap justify-center">
402406
<a href="https://tweag.io/" target="_blank" class="block w-36 m-4"><img alt="TWEAG" src="../../static/images/sponsors/tweag/tweag-683.png" srcset="
403407
/static/images/sponsors/tweag/tweag-200.png 200w,
404408
/static/images/sponsors/tweag/tweag-400.png 400w,
@@ -411,15 +415,20 @@ <h2>Affiliated Projects</h2>
411415
/static/images/sponsors/obsidian-systems/obsidian-systems-200.png 200w,
412416
/static/images/sponsors/obsidian-systems/obsidian-systems-400.png 400w,
413417
/static/images/sponsors/obsidian-systems/obsidian-systems-683.png 683w"></a>
414-
<a href="http://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../../static/images/sponsors/flipstone/flipstone-683.png" srcset="
418+
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../../static/images/sponsors/emq/emq.png" srcset="
419+
/static/images/sponsors/emq/emq.png"></a>
420+
<a href="https://www.exfreight.com/" target="_blank" class="block w-36 m-4"><img alt="ExFreight" src="../../static/images/sponsors/exfreight/exfreight.png" srcset="
421+
/static/images/sponsors/exfreight/exfreight.png"></a>
422+
</div>
423+
424+
<div class="mt-16 flex flex-wrap justify-center">
425+
<a href="https://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../../static/images/sponsors/flipstone/flipstone-683.png" srcset="
415426
/static/images/sponsors/flipstone/flipstone-200.png 200w,
416427
/static/images/sponsors/flipstone/flipstone-400.png 400w,
417428
/static/images/sponsors/flipstone/flipstone-683.png 683w"></a>
418-
<a href="http://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../../static/images/sponsors/mercury/mercury.png" srcset="
429+
<a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../../static/images/sponsors/mercury/mercury.png" srcset="
419430
/static/images/sponsors/mercury/mercury.png"></a>
420-
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../../static/images/sponsors/emq/emq.png" srcset="
421-
/static/images/sponsors/emq/emq.png"></a>
422-
431+
<a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
423432
</div>
424433
</div>
425434

@@ -443,8 +452,7 @@ <h2>Affiliated Projects</h2>
443452

444453
<div class="flex flex-row">
445454
<div class="mt-16 flex flex-col text-center flex-grow lg:flex-row lg:space-x-8 lg:space-y-0">
446-
<img src="../../static/images/haskell-foundation-logo-gray.svg" class="h-8" />
447-
<div class="font-medium">2021 © Haskell Foundation, submit website bug reports and fixes <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">here</a></div>
455+
448456
</div>
449457

450458
<div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

‎docs/affiliates/index.html

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,10 @@ <h2 class="text-2xl font-normal">Join Affiliations!</h2>
364364
/static/images/sponsors/iohk/iohk-200.png 200w,
365365
/static/images/sponsors/iohk/iohk-400.png 400w,
366366
/static/images/sponsors/iohk/iohk-683.png 683w"></a>
367+
<a href="https://digitalasset.com/" target="_blank" class="block w-36 m-4"><img alt="Digital Asset" src="../static/images/sponsors/digital-asset/digital-asset-logo-light.png" srcset="../static/images/sponsors/digital-asset/digital-asset-logo-light.png"></a>
368+
</div>
369+
370+
<div class="mt-16 flex flex-wrap justify-center">
367371
<a href="https://tweag.io/" target="_blank" class="block w-36 m-4"><img alt="TWEAG" src="../static/images/sponsors/tweag/tweag-683.png" srcset="
368372
/static/images/sponsors/tweag/tweag-200.png 200w,
369373
/static/images/sponsors/tweag/tweag-400.png 400w,
@@ -376,15 +380,20 @@ <h2 class="text-2xl font-normal">Join Affiliations!</h2>
376380
/static/images/sponsors/obsidian-systems/obsidian-systems-200.png 200w,
377381
/static/images/sponsors/obsidian-systems/obsidian-systems-400.png 400w,
378382
/static/images/sponsors/obsidian-systems/obsidian-systems-683.png 683w"></a>
379-
<a href="http://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../static/images/sponsors/flipstone/flipstone-683.png" srcset="
383+
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../static/images/sponsors/emq/emq.png" srcset="
384+
/static/images/sponsors/emq/emq.png"></a>
385+
<a href="https://www.exfreight.com/" target="_blank" class="block w-36 m-4"><img alt="ExFreight" src="../static/images/sponsors/exfreight/exfreight.png" srcset="
386+
/static/images/sponsors/exfreight/exfreight.png"></a>
387+
</div>
388+
389+
<div class="mt-16 flex flex-wrap justify-center">
390+
<a href="https://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../static/images/sponsors/flipstone/flipstone-683.png" srcset="
380391
/static/images/sponsors/flipstone/flipstone-200.png 200w,
381392
/static/images/sponsors/flipstone/flipstone-400.png 400w,
382393
/static/images/sponsors/flipstone/flipstone-683.png 683w"></a>
383-
<a href="http://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
394+
<a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
384395
/static/images/sponsors/mercury/mercury.png"></a>
385-
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../static/images/sponsors/emq/emq.png" srcset="
386-
/static/images/sponsors/emq/emq.png"></a>
387-
396+
<a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
388397
</div>
389398
</div>
390399

@@ -408,8 +417,7 @@ <h2 class="text-2xl font-normal">Join Affiliations!</h2>
408417

409418
<div class="flex flex-row">
410419
<div class="mt-16 flex flex-col text-center flex-grow lg:flex-row lg:space-x-8 lg:space-y-0">
411-
<img src="../static/images/haskell-foundation-logo-gray.svg" class="h-8" />
412-
<div class="font-medium">2021 © Haskell Foundation, submit website bug reports and fixes <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">here</a></div>
420+
413421
</div>
414422

415423
<div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

‎docs/board-nominations/index.html

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,10 @@ <h3>Criteria</h3>
371371
/static/images/sponsors/iohk/iohk-200.png 200w,
372372
/static/images/sponsors/iohk/iohk-400.png 400w,
373373
/static/images/sponsors/iohk/iohk-683.png 683w"></a>
374+
<a href="https://digitalasset.com/" target="_blank" class="block w-36 m-4"><img alt="Digital Asset" src="../static/images/sponsors/digital-asset/digital-asset-logo-light.png" srcset="../static/images/sponsors/digital-asset/digital-asset-logo-light.png"></a>
375+
</div>
376+
377+
<div class="mt-16 flex flex-wrap justify-center">
374378
<a href="https://tweag.io/" target="_blank" class="block w-36 m-4"><img alt="TWEAG" src="../static/images/sponsors/tweag/tweag-683.png" srcset="
375379
/static/images/sponsors/tweag/tweag-200.png 200w,
376380
/static/images/sponsors/tweag/tweag-400.png 400w,
@@ -383,15 +387,20 @@ <h3>Criteria</h3>
383387
/static/images/sponsors/obsidian-systems/obsidian-systems-200.png 200w,
384388
/static/images/sponsors/obsidian-systems/obsidian-systems-400.png 400w,
385389
/static/images/sponsors/obsidian-systems/obsidian-systems-683.png 683w"></a>
386-
<a href="http://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../static/images/sponsors/flipstone/flipstone-683.png" srcset="
390+
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../static/images/sponsors/emq/emq.png" srcset="
391+
/static/images/sponsors/emq/emq.png"></a>
392+
<a href="https://www.exfreight.com/" target="_blank" class="block w-36 m-4"><img alt="ExFreight" src="../static/images/sponsors/exfreight/exfreight.png" srcset="
393+
/static/images/sponsors/exfreight/exfreight.png"></a>
394+
</div>
395+
396+
<div class="mt-16 flex flex-wrap justify-center">
397+
<a href="https://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../static/images/sponsors/flipstone/flipstone-683.png" srcset="
387398
/static/images/sponsors/flipstone/flipstone-200.png 200w,
388399
/static/images/sponsors/flipstone/flipstone-400.png 400w,
389400
/static/images/sponsors/flipstone/flipstone-683.png 683w"></a>
390-
<a href="http://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
401+
<a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
391402
/static/images/sponsors/mercury/mercury.png"></a>
392-
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../static/images/sponsors/emq/emq.png" srcset="
393-
/static/images/sponsors/emq/emq.png"></a>
394-
403+
<a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
395404
</div>
396405
</div>
397406

@@ -415,8 +424,7 @@ <h3>Criteria</h3>
415424

416425
<div class="flex flex-row">
417426
<div class="mt-16 flex flex-col text-center flex-grow lg:flex-row lg:space-x-8 lg:space-y-0">
418-
<img src="../static/images/haskell-foundation-logo-gray.svg" class="h-8" />
419-
<div class="font-medium">2021 © Haskell Foundation, submit website bug reports and fixes <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">here</a></div>
427+
420428
</div>
421429

422430
<div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

‎docs/contact/index.html

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,10 @@ <h3 class="font-semibold text-xl">HF Slack</h3>
319319
/static/images/sponsors/iohk/iohk-200.png 200w,
320320
/static/images/sponsors/iohk/iohk-400.png 400w,
321321
/static/images/sponsors/iohk/iohk-683.png 683w"></a>
322+
<a href="https://digitalasset.com/" target="_blank" class="block w-36 m-4"><img alt="Digital Asset" src="../static/images/sponsors/digital-asset/digital-asset-logo-light.png" srcset="../static/images/sponsors/digital-asset/digital-asset-logo-light.png"></a>
323+
</div>
324+
325+
<div class="mt-16 flex flex-wrap justify-center">
322326
<a href="https://tweag.io/" target="_blank" class="block w-36 m-4"><img alt="TWEAG" src="../static/images/sponsors/tweag/tweag-683.png" srcset="
323327
/static/images/sponsors/tweag/tweag-200.png 200w,
324328
/static/images/sponsors/tweag/tweag-400.png 400w,
@@ -331,15 +335,20 @@ <h3 class="font-semibold text-xl">HF Slack</h3>
331335
/static/images/sponsors/obsidian-systems/obsidian-systems-200.png 200w,
332336
/static/images/sponsors/obsidian-systems/obsidian-systems-400.png 400w,
333337
/static/images/sponsors/obsidian-systems/obsidian-systems-683.png 683w"></a>
334-
<a href="http://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../static/images/sponsors/flipstone/flipstone-683.png" srcset="
338+
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../static/images/sponsors/emq/emq.png" srcset="
339+
/static/images/sponsors/emq/emq.png"></a>
340+
<a href="https://www.exfreight.com/" target="_blank" class="block w-36 m-4"><img alt="ExFreight" src="../static/images/sponsors/exfreight/exfreight.png" srcset="
341+
/static/images/sponsors/exfreight/exfreight.png"></a>
342+
</div>
343+
344+
<div class="mt-16 flex flex-wrap justify-center">
345+
<a href="https://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../static/images/sponsors/flipstone/flipstone-683.png" srcset="
335346
/static/images/sponsors/flipstone/flipstone-200.png 200w,
336347
/static/images/sponsors/flipstone/flipstone-400.png 400w,
337348
/static/images/sponsors/flipstone/flipstone-683.png 683w"></a>
338-
<a href="http://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
349+
<a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
339350
/static/images/sponsors/mercury/mercury.png"></a>
340-
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../static/images/sponsors/emq/emq.png" srcset="
341-
/static/images/sponsors/emq/emq.png"></a>
342-
351+
<a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
343352
</div>
344353
</div>
345354

@@ -363,8 +372,7 @@ <h3 class="font-semibold text-xl">HF Slack</h3>
363372

364373
<div class="flex flex-row">
365374
<div class="mt-16 flex flex-col text-center flex-grow lg:flex-row lg:space-x-8 lg:space-y-0">
366-
<img src="../static/images/haskell-foundation-logo-gray.svg" class="h-8" />
367-
<div class="font-medium">2021 © Haskell Foundation, submit website bug reports and fixes <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">here</a></div>
375+
368376
</div>
369377

370378
<div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

‎docs/donations/index.html

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,10 @@ <h2 class="text-gray-50 font-normal text-3xl-4xl text-center">In-Kind Support</h
379379
/static/images/sponsors/iohk/iohk-200.png 200w,
380380
/static/images/sponsors/iohk/iohk-400.png 400w,
381381
/static/images/sponsors/iohk/iohk-683.png 683w"></a>
382+
<a href="https://digitalasset.com/" target="_blank" class="block w-36 m-4"><img alt="Digital Asset" src="../static/images/sponsors/digital-asset/digital-asset-logo-light.png" srcset="../static/images/sponsors/digital-asset/digital-asset-logo-light.png"></a>
383+
</div>
384+
385+
<div class="mt-16 flex flex-wrap justify-center">
382386
<a href="https://tweag.io/" target="_blank" class="block w-36 m-4"><img alt="TWEAG" src="../static/images/sponsors/tweag/tweag-683.png" srcset="
383387
/static/images/sponsors/tweag/tweag-200.png 200w,
384388
/static/images/sponsors/tweag/tweag-400.png 400w,
@@ -391,15 +395,20 @@ <h2 class="text-gray-50 font-normal text-3xl-4xl text-center">In-Kind Support</h
391395
/static/images/sponsors/obsidian-systems/obsidian-systems-200.png 200w,
392396
/static/images/sponsors/obsidian-systems/obsidian-systems-400.png 400w,
393397
/static/images/sponsors/obsidian-systems/obsidian-systems-683.png 683w"></a>
394-
<a href="http://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../static/images/sponsors/flipstone/flipstone-683.png" srcset="
398+
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../static/images/sponsors/emq/emq.png" srcset="
399+
/static/images/sponsors/emq/emq.png"></a>
400+
<a href="https://www.exfreight.com/" target="_blank" class="block w-36 m-4"><img alt="ExFreight" src="../static/images/sponsors/exfreight/exfreight.png" srcset="
401+
/static/images/sponsors/exfreight/exfreight.png"></a>
402+
</div>
403+
404+
<div class="mt-16 flex flex-wrap justify-center">
405+
<a href="https://flipstone.com/" target="_blank" class="block w-36 m-4"><img alt="FLIPSTONE" src="../static/images/sponsors/flipstone/flipstone-683.png" srcset="
395406
/static/images/sponsors/flipstone/flipstone-200.png 200w,
396407
/static/images/sponsors/flipstone/flipstone-400.png 400w,
397408
/static/images/sponsors/flipstone/flipstone-683.png 683w"></a>
398-
<a href="http://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
409+
<a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
399410
/static/images/sponsors/mercury/mercury.png"></a>
400-
<a href="https://www.emqx.io/" target="_blank" class="block w-36 m-4"><img alt="EMQ" src="../static/images/sponsors/emq/emq.png" srcset="
401-
/static/images/sponsors/emq/emq.png"></a>
402-
411+
<a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
403412
</div>
404413
</div>
405414

@@ -423,8 +432,7 @@ <h2 class="text-gray-50 font-normal text-3xl-4xl text-center">In-Kind Support</h
423432

424433
<div class="flex flex-row">
425434
<div class="mt-16 flex flex-col text-center flex-grow lg:flex-row lg:space-x-8 lg:space-y-0">
426-
<img src="../static/images/haskell-foundation-logo-gray.svg" class="h-8" />
427-
<div class="font-medium">2021 © Haskell Foundation, submit website bug reports and fixes <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">here</a></div>
435+
428436
</div>
429437

430438
<div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

0 commit comments

Comments
 (0)