Skip to content

Commit

Permalink
Updated logo
Browse files Browse the repository at this point in the history
includes logo page, favicon support, and new logo
  • Loading branch information
ReedCopsey committed Oct 2, 2014
1 parent 9ba2461 commit 0635a9a
Show file tree
Hide file tree
Showing 35 changed files with 96 additions and 1 deletion.
20 changes: 19 additions & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,25 @@
<!-- TODO: add a unique meta description to each page -->
<meta name="description" content="" />
<meta name="keywords" content="F#, FSharp, F# Programming" />

<title>{{ page.title }}</title>

<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="/favicon-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="/favicon-160x160.png" sizes="160x160">
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
<meta name="msapplication-TileColor" content="#2d3947">
<meta name="msapplication-TileImage" content="/mstile-144x144.png">

<link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet" media="screen" />
<link href='http://fonts.googleapis.com/css?family=Orienta' rel='stylesheet' media="screen" />
<link rel="stylesheet" href="/css/main.css" media="screen" />
Expand Down Expand Up @@ -133,6 +149,7 @@
<li><a href="/foundation.html#founding_members">Members</a></li>
<li><a href="/technical-groups">Affiliated technical groups</a></li>
<li><a href="http://fsharp.github.io">F# Open Engineering Group</a></li>
<li><a href="/foundation/logo.html">F# Logo</a></li>
<li><a href="/foundation.html#contact">Contact</a></li>
</ul>
</li>
Expand Down Expand Up @@ -244,6 +261,7 @@ <h4>Foundation</h4>
<li><a href="/foundation.html#founding_members">Members</a></li>
<li><a href="/technical-groups">Affiliated technical groups</a></li>
<li><a href="http://fsharp.github.io">F# Open Engineering Group</a></li>
<li><a href="/foundation/logo.html">F# Logo</a></li>
<li><a href="/foundation.html#contact">Contact</a></li>
</ul>
<p></p><a href="https://twitter.com/fsharporg" class="twitter-follow-button" data-show-count="false" data-show-user-name="false">Follow @fsharporg</a>
Expand Down
Binary file added apple-touch-icon-114x114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon-57x57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon-60x60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon-76x76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon-precomposed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="/mstile-70x70.png"/>
<square150x150logo src="/mstile-150x150.png"/>
<square310x310logo src="/mstile-310x310.png"/>
<wide310x150logo src="/mstile-310x150.png"/>
<TileColor>#2d3947</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added favicon-160x160.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added favicon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added favicon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added favicon.ico
Binary file not shown.
10 changes: 10 additions & 0 deletions foundation/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="refresh" content="0; url=/foundation.html">
<link rel="canonical" href="/foundation.html" />
</head>
<body>
Please visit the <a href="/foundation.html">Foundation page</a> directly.
</body>
</html>
50 changes: 50 additions & 0 deletions foundation/logo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
layout: default
title: The F# Logo | The F# Software Foundation
headline: Usage of the F# logo
---

Projects and companies that are using F# are welcome and encouraged to incorporate the F#
logo on their website, brochures, and other media. The logo can be used anywhere suitable
to indicate a project is intended for use with F# or was implemented in F#.

## Guidelines for Use

![F# Logo](/img/logo.png)

The F# logo is a trademark of the F# Software Foundation, which is responsible for defending
against any damaging or confusing uses of the trademark.

Usage of the logo is allowed, provided that the logo remains uchanged. Do not alter the
color, proportions, or the image in any way.

The logo is available in the following variants:

* [PNG, 128x128, Transparent Background](/img/logo/fsharp128.png)
* [PNG, 256x256, Transparent Background](/img/logo/fsharp256.png)
* [PNG, 512x512, Transparent Background](/img/logo/fsharp512.png)
* [PNG, 2048x2048, Transparent Background](/img/logo/fsharp2048.png)

Versions of the logo have also been made specifically to be used for derivations and combining
within other project logos. These are monochromatic, semi-opaque versions which should be used
on a solid background, in order to make a composite logo image with another project.

Variants using a "lighter" color scheme are preferred,and intended for usage on a dark or fully
saturated background. The "darker" scheme is intended for compositing with lighter backgrounds,
or scenarios when the lighter variant does not blend well. Note that the lighter variant will
not be visible when viewed directly in a browser, as it's comprised of white color on a transparent
background.

* [PNG, Lighter variant, 100x100, Transparent Background](/img/logo/fsharp100mclight.png)
* [PNG, Darker variant, 100x100, Transparent Background](/img/logo/fsharp100mcdark.png)

These versions can be used to create logos for projects, companies, or solutions which either
use F# in their implementation or are specifically intended for use from F#.

The preferred font for use with the logo is [Rajdhani](https://www.google.com/fonts/specimen/Rajdhani),
an open source typeface.

Usage of the logo for any other purpose is not allowed without prior approval and permission from
the F# Software Foundation. For more information or to get permission for other scenarios, please
contact the F# Software Foundation at [fsharp@fsharp.org](mailto:fsharp@fsharp.org).

1 change: 1 addition & 0 deletions humans.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
Tomas Petricek Organizer @tomaspetricek
John Fair Web Developer @johnbfair
Steffen Forkmann @Ssforkmann
Reed Copsey @ReedCopsey

# THANKS
Microsoft
Expand Down
Binary file modified img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/logo/fsharp100mcdark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/logo/fsharp100mclight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/logo/fsharp128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/logo/fsharp2048.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/logo/fsharp256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/logo/fsharp512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mstile-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mstile-310x150.png
Binary file added mstile-310x310.png
Binary file added mstile-70x70.png
4 changes: 4 additions & 0 deletions sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
<loc>http://fsharp.org/foundation.html</loc>
<priority>0.6</priority>
</url>
<url>
<loc>http://fsharp.org/foundation/logo.html</loc>
<priority>0.6</priority>
</url>
<url>
<loc>http://fsharp.org/webstacks/index.html</loc>
<priority>0.5</priority>
Expand Down

0 comments on commit 0635a9a

Please sign in to comment.