Skip to content

Various suggested changes #958

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Mar 11, 2025
Merged

Various suggested changes #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9a71ae
New fonts
IanWitham Mar 11, 2025
2ff35e0
Remove x.com link
IanWitham Mar 11, 2025
d522c2e
Restored "How to reference f#" link. Removed "member roster" link.
IanWitham Mar 11, 2025
9a276e4
Remove User Groups and Speakers Program links
IanWitham Mar 11, 2025
50fa620
Remove Visual Studio for Mac instructions
IanWitham Mar 11, 2025
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
25 changes: 7 additions & 18 deletions _includes/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<a href="https://www.youtube.com/c/fsharporg" role="menuitem" class="group"
tabindex="-1">Videos (FSFF channel)</a>
<a href="https://www.youtube.com/results?search_query=learn+f%23" role="menuitem"
class="group" tabindex="-1">Videos <span class="badge">unaffiliated</span></a>
class="group" tabindex="-1">Videos (Community)</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -126,14 +126,7 @@
<a role="menuitem" class="group" href="{{ '/community/projects/' | relative_url }}">F# Community Projects</a>
<a role="menuitem" class="group" href="http://www.fssnip.net/">F# Code Snippets</a>
<a role="menuitem" class="group"
href="http://codereview.stackexchange.com/questions/tagged/f%23">F# Code Review <span
class="badge">unaffiliated</span></a>
</div>
<div role="none">
<a role="menuitem" class="group" href="https://community.fsharp.org/user_groups">User
Groups</a>
<a role="menuitem" class="group" href="https://community.fsharp.org/speakers">Speakers
Program</a>
href="http://codereview.stackexchange.com/questions/tagged/f%23">F# Code Review</a>
</div>
<div role="none">
<a role="menuitem" class="group" href="https://forums.fsharp.org">
Expand All @@ -143,21 +136,17 @@
<i class="fa-brands fa-slack"></i> Slack
</a>
<a role="menuitem" class="group" href="https://discord.gg/R6n7c54">
<i class="fa-brands fa-discord"></i> Discord <span class="badge">unaffiliated</span>
<i class="fa-brands fa-discord"></i> Discord
</a>
<a href="https://bsky.app/starter-pack/blizard.io/3la4zswhqbt2e" role="menuitem"
class="group" tabindex="-1">
<i class="fa-brands fa-bluesky"></i> Bluesky <span class="badge">unaffiliated</span>
</a>
<a role="menuitem" class="group" href="https://x.com/search?q=%23fsharp">
<i class="fa-brands fa-x-twitter"></i> X.com <span class="badge">unaffiliated</span>
<i class="fa-brands fa-bluesky"></i> Bluesky
</a>
<a role="menuitem" class="group" href="https://www.reddit.com/r/fsharp/">
<i class="fa-brands fa-reddit"></i> Reddit <span class="badge">unaffiliated</span>
<i class="fa-brands fa-reddit"></i> Reddit
</a>
<a role="menuitem" class="group" href="http://stackoverflow.com/questions/tagged/f%23">
<i class="fa-brands fa-stack-overflow"></i> StackOverflow <span
class="badge">unaffiliated</span>
<i class="fa-brands fa-stack-overflow"></i> StackOverflow
</a>
</div>
</div>
Expand All @@ -174,7 +163,7 @@
<a role="menuitem" href="https://foundation.fsharp.org">Mission statement</a>
<a role="menuitem" href="https://foundation.fsharp.org/join">Join</a>
<a role="menuitem" href="https://foundation.fsharp.org/announcements">Announcements</a>
<a role="menuitem" href="https://foundation.fsharp.org/member_roster">Member Roster</a>
<!-- <a role="menuitem" href="https://foundation.fsharp.org/member_roster">Member Roster</a> -->
<a role="menuitem" href="https://foundation.fsharp.org/code_of_conduct">Code of Conduct</a>
<a role="menuitem" href="https://foundation.fsharp.org/donate">Donate</a>
<a role="menuitem" href="https://foundation.fsharp.org/logo">F# Logo</a>
Expand Down
4 changes: 2 additions & 2 deletions _layouts/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href='https://fonts.googleapis.com/css?family=Inter' rel='stylesheet' type='text/css' />
<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">
<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,wght@8..144,100..1000&display=swap" rel="stylesheet">

<link href="{{ '/css/fontawesome6/css/fontawesome.css' | relative_url }}" rel="stylesheet" />
<link rel="stylesheet" href="{{ '/css/fontawesome6/css/brands.min.css' | relative_url }}"" />
<link rel="stylesheet" href="{{ '/css/fontawesome6/css/solid.min.css' | relative_url }}" />
Expand Down
8 changes: 6 additions & 2 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
@theme {
--color-brand-dark: #378bba;
--color-brand-light: #30b9db;
--font-sans: "Open Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-heading: "Rajdhani", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-sans: "Inter", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-heading: "Roboto Flex", sans-serif;
}



button {
@apply cursor-pointer
}
Expand Down Expand Up @@ -104,6 +106,8 @@ a[href^="http"]::after {
font-weight: normal;
font-style: normal;
font-size: .6em;
vertical-align: 0.1rem;
opacity: 0.6;
display: inline-block;
text-decoration: none;
padding-left: 0.4em;
Expand Down
14 changes: 9 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,11 @@ <h3 class="text-2xl font-semibold"><i class="fa-solid fa-highlighter mr-2 text-b
<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>
<ul class="list-unstyled space-y-2">
<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>
<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>
<li>Join the conversation on
<a class="transition hover:text-brand-dark hover:dark:text-brand-light" href="https://x.com/search?q=%23fsharp">Bluesky,</a>
<a class="transition hover:text-brand-dark hover:dark:text-brand-light" href="https://x.com/search?q=%23fsharp">Discord,</a>
or <a class="transition hover:text-brand-dark hover:dark:text-brand-light" href="https://x.com/search?q=%23fsharp">Reddit</a>
</li>
<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>
</ul>
</div>
Expand Down Expand Up @@ -151,16 +155,16 @@ <h2 class="text-heading hover:text-brand-dark hover:dark:text-brand-light mt-8 m
<div class="flex flex-row place-content-center items-center justify-around flex-wrap">

<div class="p-4">
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/fsharpworks.png" alt="fsharpWorks" />
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/fsharpworks.png" alt="fsharpWorks logo" />
</div>
<div class="p-4">
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/prolucid.png" />
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/prolucid.png" alt="prolucid logo" />
</div>
<div class="p-4">
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/genetec.png" />
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/genetec.png" alt="genetec logo" />
</div>
<div class="p-4">
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/drdispatch.png" />
<img class="mx-auto d-block img-fluid carousel-img" src="img/sup/drdispatch.png" alt="drdispatch logo" />
</div>
</div>
</div>
Expand Down
Loading