Skip to content

Commit a4e967b

Browse files
dsymedsyme
authored
Merge pull request #958 from IanWitham/gh-pages
Various suggested changes
2 parents c68cb36 + 50fa620 commit a4e967b

File tree

7 files changed

+1590
-11353
lines changed

7 files changed

+1590
-11353
lines changed

‎_includes/navbar.html

+7-18
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<a href="https://www.youtube.com/c/fsharporg" role="menuitem" class="group"
7373
tabindex="-1">Videos (FSFF channel)</a>
7474
<a href="https://www.youtube.com/results?search_query=learn+f%23" role="menuitem"
75-
class="group" tabindex="-1">Videos <span class="badge">unaffiliated</span></a>
75+
class="group" tabindex="-1">Videos (Community)</a>
7676
</div>
7777
</div>
7878
</div>
@@ -126,14 +126,7 @@
126126
<a role="menuitem" class="group" href="{{ '/community/projects/' | relative_url }}">F# Community Projects</a>
127127
<a role="menuitem" class="group" href="http://www.fssnip.net/">F# Code Snippets</a>
128128
<a role="menuitem" class="group"
129-
href="http://codereview.stackexchange.com/questions/tagged/f%23">F# Code Review <span
130-
class="badge">unaffiliated</span></a>
131-
</div>
132-
<div role="none">
133-
<a role="menuitem" class="group" href="https://community.fsharp.org/user_groups">User
134-
Groups</a>
135-
<a role="menuitem" class="group" href="https://community.fsharp.org/speakers">Speakers
136-
Program</a>
129+
href="http://codereview.stackexchange.com/questions/tagged/f%23">F# Code Review</a>
137130
</div>
138131
<div role="none">
139132
<a role="menuitem" class="group" href="https://forums.fsharp.org">
@@ -143,21 +136,17 @@
143136
<i class="fa-brands fa-slack"></i> Slack
144137
</a>
145138
<a role="menuitem" class="group" href="https://discord.gg/R6n7c54">
146-
<i class="fa-brands fa-discord"></i> Discord <span class="badge">unaffiliated</span>
139+
<i class="fa-brands fa-discord"></i> Discord
147140
</a>
148141
<a href="https://bsky.app/starter-pack/blizard.io/3la4zswhqbt2e" role="menuitem"
149142
class="group" tabindex="-1">
150-
<i class="fa-brands fa-bluesky"></i> Bluesky <span class="badge">unaffiliated</span>
151-
</a>
152-
<a role="menuitem" class="group" href="https://x.com/search?q=%23fsharp">
153-
<i class="fa-brands fa-x-twitter"></i> X.com <span class="badge">unaffiliated</span>
143+
<i class="fa-brands fa-bluesky"></i> Bluesky
154144
</a>
155145
<a role="menuitem" class="group" href="https://www.reddit.com/r/fsharp/">
156-
<i class="fa-brands fa-reddit"></i> Reddit <span class="badge">unaffiliated</span>
146+
<i class="fa-brands fa-reddit"></i> Reddit
157147
</a>
158148
<a role="menuitem" class="group" href="http://stackoverflow.com/questions/tagged/f%23">
159-
<i class="fa-brands fa-stack-overflow"></i> StackOverflow <span
160-
class="badge">unaffiliated</span>
149+
<i class="fa-brands fa-stack-overflow"></i> StackOverflow
161150
</a>
162151
</div>
163152
</div>
@@ -174,7 +163,7 @@
174163
<a role="menuitem" href="https://foundation.fsharp.org">Mission statement</a>
175164
<a role="menuitem" href="https://foundation.fsharp.org/join">Join</a>
176165
<a role="menuitem" href="https://foundation.fsharp.org/announcements">Announcements</a>
177-
<a role="menuitem" href="https://foundation.fsharp.org/member_roster">Member Roster</a>
166+
<!-- <a role="menuitem" href="https://foundation.fsharp.org/member_roster">Member Roster</a> -->
178167
<a role="menuitem" href="https://foundation.fsharp.org/code_of_conduct">Code of Conduct</a>
179168
<a role="menuitem" href="https://foundation.fsharp.org/donate">Donate</a>
180169
<a role="menuitem" href="https://foundation.fsharp.org/logo">F# Logo</a>

‎_layouts/main.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
<link rel="preconnect" href="https://fonts.googleapis.com">
2929
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
30-
<link href='https://fonts.googleapis.com/css?family=Inter' rel='stylesheet' type='text/css' />
31-
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&family=Rajdhani:wght@300;400;500;600;700&display=swap" rel="stylesheet">
30+
<link href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=Roboto+Flex:opsz,[email protected],100..1000&display=swap" rel="stylesheet">
31+
3232
<link href="{{ '/css/fontawesome6/css/fontawesome.css' | relative_url }}" rel="stylesheet" />
3333
<link rel="stylesheet" href="{{ '/css/fontawesome6/css/brands.min.css' | relative_url }}"" />
3434
<link rel="stylesheet" href="{{ '/css/fontawesome6/css/solid.min.css' | relative_url }}" />

‎css/main.css

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
@theme {
77
--color-brand-dark: #378bba;
88
--color-brand-light: #30b9db;
9-
--font-sans: "Open Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
10-
--font-heading: "Rajdhani", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
9+
--font-sans: "Inter", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
10+
--font-heading: "Roboto Flex", sans-serif;
1111
}
1212

13+
14+
1315
button {
1416
@apply cursor-pointer
1517
}
@@ -104,6 +106,8 @@ a[href^="http"]::after {
104106
font-weight: normal;
105107
font-style: normal;
106108
font-size: .6em;
109+
vertical-align: 0.1rem;
110+
opacity: 0.6;
107111
display: inline-block;
108112
text-decoration: none;
109113
padding-left: 0.4em;

‎index.html

+9-5
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ <h3 class="text-2xl font-semibold"><i class="fa-solid fa-highlighter mr-2 text-b
7878
<h3 class="text-2xl font-semibold"><i class="fa-solid fa-users mr-2 text-brand-dark dark:text-brand-light mb-6"></i> Community</h3>
7979
<ul class="list-unstyled space-y-2">
8080
<li><a class="transition hover:text-brand-dark hover:dark:text-brand-light" href="https://foundation.fsharp.org/join" onclick="_gaq.push(['_trackEvent', 'home-community', 'clicked', 'join'])">Join the F# Software Foundation</a></li>
81-
<li><a class="transition hover:text-brand-dark hover:dark:text-brand-light" href="https://x.com/search?q=%23fsharp">Participate on X.com</a></li>
81+
<li>Join the conversation on
82+
<a class="transition hover:text-brand-dark hover:dark:text-brand-light" href="https://x.com/search?q=%23fsharp">Bluesky,</a>
83+
<a class="transition hover:text-brand-dark hover:dark:text-brand-light" href="https://x.com/search?q=%23fsharp">Discord,</a>
84+
or <a class="transition hover:text-brand-dark hover:dark:text-brand-light" href="https://x.com/search?q=%23fsharp">Reddit</a>
85+
</li>
8286
<li><a class="transition hover:text-brand-dark hover:dark:text-brand-light" href="{{ '/community/projects/' | relative_url }}" onclick="_gaq.push(['_trackEvent', 'home-community', 'clicked', 'contribute'])">Contribute to F# projects</a></li>
8387
</ul>
8488
</div>
@@ -151,16 +155,16 @@ <h2 class="text-heading hover:text-brand-dark hover:dark:text-brand-light mt-8 m
151155
<div class="flex flex-row place-content-center items-center justify-around flex-wrap">
152156

153157
<div class="p-4">
154-
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/fsharpworks.png" alt="fsharpWorks" />
158+
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/fsharpworks.png" alt="fsharpWorks logo" />
155159
</div>
156160
<div class="p-4">
157-
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/prolucid.png" />
161+
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/prolucid.png" alt="prolucid logo" />
158162
</div>
159163
<div class="p-4">
160-
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/genetec.png" />
164+
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/genetec.png" alt="genetec logo" />
161165
</div>
162166
<div class="p-4">
163-
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/drdispatch.png" />
167+
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/drdispatch.png" alt="drdispatch logo" />
164168
</div>
165169
</div>
166170
</div>

0 commit comments

Comments
 (0)