Skip to content

Commit b4aa75b

Browse files
emilypiemilypi
authored
Merge pull request #35 from haskellfoundation/feat/update-affiliations
Add Press page, Update Logo + Affiliations, Nav reorg
2 parents cdead13 + a678734 commit b4aa75b

File tree

9 files changed

+150
-70
lines changed

9 files changed

+150
-70
lines changed

‎site/affiliates/index.html

+58-36
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</div>
3232
<div class="text-center pt-12 md:pt-20 px-12 sm:px-16 md:px-24 lg:px-36 ">
3333
<h1 class="text-2xl-5xl">Affiliates</h1>
34-
34+
3535
</div>
3636
</div>
3737

@@ -40,9 +40,9 @@ <h1 class="text-2xl-5xl">Affiliates</h1>
4040
<div class="xl:max-w-screen-xl mx-auto md:px-12 lg:px-16">
4141
<div class="bg-gray-800 shadow-lg shadow-xl shadow-md shadow-sm px-6 sm:px-12 md:px-12 lg:px-16 py-16 md:py-20">
4242
<div class="grid gap-8 lg:grid-cols-2 lg:gap-16 lg:text-xl text-gray-300 leading-relaxed">
43-
43+
4444
<div>
45-
We invite existing Haskell projects, committees and communities to explicitly affiliate and align themselves with the Haskell Foundation. Affiliation means that the group supports the goals of the Haskell Foundation, and that the Haskell Foundation in turn supports this group.
45+
We invite existing Haskell projects, committees and communities to explicitly affiliate and align themselves with the Haskell Foundation. Affiliation means that the group supports the goals of the Haskell Foundation, and that the Haskell Foundation in turn supports this group.
4646
</div>
4747
<div>
4848
We require affiliated groups to adhere to guidelines around transparency, being open to new members, and follow the <a href="/guidelines-for-respectful-communication" target="_blank">Haskell committee guidelines for respectful communication</a>. We believe that this will help us grow towards being a more open and welcoming community.
@@ -63,22 +63,51 @@ <h2 class="text-2xl font-normal">Affiliated</h2>
6363
</div>
6464

6565
<div class="border-l-3 border-gray-300 ml-5 md:ml-8 lg:ml-10 pl-4 md:pl-8 lg:pl-14 pr-4 my-6 md:my-8 lg:my-10 grid lg:grid-cols-2 py-4 md:py-8 gap-4 md:gap-8">
66-
66+
6767
<a class="block border-l-3 border-purple-700 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://github.com/haskell/haskell-language-server" target="_blank">
6868
<div class="font-medium">Haskell IDE Team</div>
6969
<div class="text-gray-600 break-all">github.com/haskell/haskell-language-server</div>
7070
</a>
71-
71+
7272
<a class="block border-l-3 border-purple-700 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://github.com/ghc-proposals/ghc-proposals" target="_blank">
7373
<div class="font-medium">GHC Steering Committee</div>
7474
<div class="text-gray-600 break-all">github.com/ghc-proposals/ghc-proposals</div>
7575
</a>
76-
76+
7777
<a class="block border-l-3 border-purple-700 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://haskellweekly.news/" target="_blank">
7878
<div class="font-medium">Haskell Weekly</div>
7979
<div class="text-gray-600 break-all">haskellweekly.news/</div>
8080
</a>
81-
81+
82+
83+
<a class="block border-l-3 border-purple-700 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://wiki.haskell.org/Core_Libraries_Committee" target="_blank">
84+
<div class="font-medium">Core Libraries Committee</div>
85+
<div class="text-gray-600 break-all">wiki.haskell.org/Core_Libraries_Committee</div>
86+
</a>
87+
88+
<a class="block border-l-3 border-purple-700 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://zfoh.ch/zurihac2021/" target="_blank">
89+
<div class="font-medium">Haskell Love</div>
90+
<div class="text-gray-600 break-all">https://haskell.love/</div>
91+
</a>
92+
93+
<a class="block border-l-3 border-purple-700 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://zfoh.ch/zurihac2021/" target="_blank">
94+
<div class="font-medium">Zurihac</div>
95+
<div class="text-gray-600 break-all">https://zfoh.ch/zurihac2021/</div>
96+
</a>
97+
98+
<a class="block border-l-3 border-purple-700 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://www.haskell.org/haskell-org-committee" target="_blank">
99+
<div class="font-medium">Haskell.org Committee</div>
100+
<div class="text-gray-600 break-all">www.haskell.org/haskell-org-committee</div>
101+
</a>
102+
103+
104+
105+
<a class="block border-l-3 border-purple-700 shadow-lg px-4 py-2 md:py-4" href="https://github.com/haskell-infra/haskell-admins" target="_blank">
106+
<div class="font-medium">The Haskell Admins</div>
107+
<div class="text-gray-600 break-all">https://github.com/haskell-infra/haskell-admins</div>
108+
</a>
109+
110+
82111
</div>
83112

84113
<div class="flex items-center space-x-4">
@@ -89,35 +118,28 @@ <h2 class="text-2xl font-normal">Pending Affiliations</h2>
89118
</div>
90119

91120
<div class="border-l-3 border-gray-300 ml-5 md:ml-8 lg:ml-10 pl-4 md:pl-8 lg:pl-14 pr-4 my-6 md:my-8 lg:my-10 grid lg:grid-cols-2 py-4 md:py-8 gap-4 md:gap-8">
92-
93-
94-
<a class="block border-l-3 border-gray-400 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://wiki.haskell.org/Core_Libraries_Committee" target="_blank">
95-
<div class="font-medium">Core Libraries Committee</div>
96-
<div class="text-gray-600 break-all">wiki.haskell.org/Core_Libraries_Committee</div>
97-
</a>
98-
99-
100-
101-
<a class="block border-l-3 border-gray-400 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://www.haskell.org/haskell-org-committee" target="_blank">
102-
<div class="font-medium">Haskell.org Committee</div>
103-
<div class="text-gray-600 break-all">www.haskell.org/haskell-org-committee</div>
104-
</a>
105-
106-
107-
108-
<div class="block border-l-3 border-gray-400 shadow-lg px-4 py-2 md:py-4" href="https://" target="_blank">
109-
<div class="font-medium">The Haskell Admins</div>
110-
<div class="text-gray-600 break-all"></div>
111-
</div>
112-
113-
114-
115-
<a class="block border-l-3 border-gray-400 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://www.haskell.org/cabal/" target="_blank">
116-
<div class="font-medium">Cabal</div>
117-
<div class="text-gray-600 break-all">www.haskell.org/cabal/</div>
118-
</a>
119-
120-
121+
122+
123+
<a class="block border-l-3 border-gray-400 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://www.haskell.org/cabal/" target="_blank">
124+
<div class="font-medium">Cabal team</div>
125+
<div class="text-gray-600 break-all">www.haskell.org/cabal/</div>
126+
</a>
127+
128+
<a class="block border-l-3 border-gray-400 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://haskellstack.org/" target="_blank">
129+
<div class="font-medium">Stack team</div>
130+
<div class="text-gray-600 break-all">https://haskellstack.org/</div>
131+
</a>
132+
133+
<a class="block border-l-3 border-gray-400 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://github.com/haskell-infra/hackage-trustees" target="_blank">
134+
<div class="font-medium">Hackage Trustees</div>
135+
<div class="text-gray-600 break-all">https://github.com/haskell-infra/hackage-trustees</div>
136+
</a>
137+
138+
<a class="block border-l-3 border-gray-400 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="https://github.com/commercialhaskell/stackage/blob/master/CURATORS.md" target="_blank">
139+
<div class="font-medium">Stackage Curators</div>
140+
<div class="text-gray-600 break-all">https://github.com/commercialhaskell/stackage/blob/master/CURATORS.md</div>
141+
</a>
142+
121143
</div>
122144

123145
<div class="flex items-center space-x-4">

‎site/press/index.html

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
2+
3+
4+
<div class="max-w-screen-xl mx-auto py-16 md:py-24">
5+
<div class="sm:px-6 lg:px-16">
6+
<div class="relative">
7+
<div class="absolute top-0 left-0 border-t border-l border-purple-50 h-10 md:h-20 w-10 md:w-20">
8+
<div class="absolute top-1 md:top-2 left-1 md:left-2 border-t border-l border-purple-100 h-10 md:h-20 w-10 md:w-20">
9+
<div class="absolute top-1 md:top-2 left-1 md:left-2 border-t border-l border-purple-200 h-10 md:h-20 w-10 md:w-20">
10+
<div class="absolute top-1 md:top-2 left-1 md:left-2 border-t border-l border-purple-300 h-10 md:h-20 w-10 md:w-20">
11+
<div class="absolute top-1 md:top-2 left-1 md:left-2 border-t border-l border-purple-400 h-10 md:h-20 w-10 md:w-20">
12+
<div class="absolute top-1 md:top-2 left-1 md:left-2 border-t border-l border-purple-500 h-10 md:h-20 w-10 md:w-20"></div>
13+
</div>
14+
</div>
15+
</div>
16+
</div>
17+
</div>
18+
<div class="absolute top-0 right-0 border-t border-r border-purple-50 h-10 md:h-20 w-10 md:w-20">
19+
<div class="absolute top-1 md:top-2 right-1 md:right-2 border-t border-r border-purple-100 h-10 md:h-20 w-10 md:w-20">
20+
<div class="absolute top-1 md:top-2 right-1 md:right-2 border-t border-r border-purple-200 h-10 md:h-20 w-10 md:w-20">
21+
<div class="absolute top-1 md:top-2 right-1 md:right-2 border-t border-r border-purple-300 h-10 md:h-20 w-10 md:w-20">
22+
<div class="absolute top-1 md:top-2 right-1 md:right-2 border-t border-r border-purple-400 h-10 md:h-20 w-10 md:w-20">
23+
<div class="absolute top-1 md:top-2 right-1 md:right-2 border-t border-r border-purple-500 h-10 md:h-20 w-10 md:w-20"></div>
24+
</div>
25+
</div>
26+
</div>
27+
</div>
28+
</div>
29+
</div>
30+
31+
</div>
32+
<div class="text-center pt-12 md:pt-20 px-12 sm:px-16 md:px-24 lg:px-36 ">
33+
<h1 class="text-2xl-5xl">Press</h1>
34+
35+
</div>
36+
</div>
37+
38+
39+
<div class="max-w-screen-md mx-auto grid gap-8">
40+
41+
42+
<div class="bg-gray-100 px-6 sm:px-12 space-y-4 py-12">
43+
<a href="https://iohk.io/en/blog/posts/2020/11/04/iohk-sponsors-new-haskell-foundation/"><h2 class="font-normal text-xl-2xl">IOHK Sponsors the Haskell Foundation</h2></a>
44+
<p>
45+
IOHK is one of the first sponsors of the Haskell Foundation because we believe in the power of functional programming, open-source software, and open governance. So, we are delighted to be able to join other key companies in supporting the community through an open and transparent process in which everyone can participate...
46+
</p>
47+
</div>
48+
49+
</div>

‎site/static/images/logos/hf-logo-100-alpha.png

15.1 KB
Loading

‎site/static/images/logos/hf-logo-200-alpha.png

20.1 KB
Loading

‎site/static/images/logos/hf-logo-600px-alpha.png

40.1 KB
Loading

‎site/static/images/logos/hf-logo-large-alpha.png

44 KB
Loading

‎site/static/images/logos/hf_logo.png

55.1 KB
Loading

‎site/templates/mobile-nav-flyout.html

+36-32
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<div id="nav-backdrop" class="fixed z-10 inset-0 hidden"></div>
22

33
<div id="mobile-nav" class="fixed z-20 top-0 right-0 w-full sm:w-1/2 max-h-full overflow-auto hidden rounded-b shadow-lg bg-white px-4">
4-
4+
55
<div class="pt-6 flex justify-between">
66

77
<div>
8-
<img src="/static/images/hf_logo.png" width="68" height="52" />
9-
<div class="text-sm mt-2 text-gray-500">The Haskell Foundation (HF)</div>
8+
<img src="/static/images/hf-logo-100-alpha.png" width="68" height="52" />
9+
<div class="text-sm mt-2 text-gray-500">The Haskell Foundation</div>
1010
</div>
1111

1212
<div class="">
@@ -21,44 +21,48 @@
2121

2222
<div class="mt-6">
2323
<a href="/" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Home</a>
24-
25-
26-
<a href="/who-we-are" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Who We Are</a>
27-
28-
29-
24+
25+
26+
<div href="/who-we-are" class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">Who We Are</div>
27+
28+
<a href="/who-we-are" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Current Board</a>
29+
30+
<a href="/affiliates/past-boards" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Past Boards</a>
31+
3032
<a href="/projects" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Projects</a>
31-
32-
33-
33+
34+
35+
3436
<div href="/affiliates" class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">Affiliates</div>
35-
37+
3638
<a href="/affiliates" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Affiliates</a>
37-
39+
3840
<a href="/affiliates/about" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">About Affiliating</a>
39-
40-
41-
42-
41+
42+
43+
4344
<a href="/contact" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Contact</a>
44-
45-
46-
45+
46+
47+
4748
<a href="/news" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">News</a>
48-
49-
50-
49+
50+
51+
52+
<a href="/press" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Press</a>
53+
54+
5155
<a href="/donations" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Sponsorship</a>
52-
53-
54-
56+
57+
58+
5559
<a href="/resources" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Resources</a>
56-
57-
58-
60+
61+
62+
5963
<a href="/faq" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">FAQ</a>
60-
61-
64+
65+
6266
</div>
6367

6468

‎site/templates/nav.html

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<div>
44
<a href="/">
5-
<img src="/static/images/hf_logo.png" width="68" height="52" />
6-
<div class="text-sm mt-2 text-gray-500">The Haskell Foundation (HF)</div>
5+
<img src="/static/images/hf-logo-100-alpha.png" />
6+
<div class="text-sm mt-2 text-gray-500"></div>
77
</a>
88
</div>
99

@@ -59,6 +59,11 @@
5959

6060
</li>
6161

62+
<li class="relative">
63+
<a href="/press" id="">Press</a>
64+
65+
</li>
66+
6267
<li class="relative">
6368
<a href="/donations" id="">Sponsorship</a>
6469

0 commit comments

Comments
 (0)