Skip to content

Commit e6b4790

Browse files
johnbfairjohnbfair
committed
Changing FSharp.org over to Twitter Bootstrap
1 parent bd3535e commit e6b4790

30 files changed

+9487
-426
lines changed

‎404.html

+157
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Page Not Found :(</title>
6+
<style>
7+
::-moz-selection {
8+
background: #b3d4fc;
9+
text-shadow: none;
10+
}
11+
12+
::selection {
13+
background: #b3d4fc;
14+
text-shadow: none;
15+
}
16+
17+
html {
18+
padding: 30px 10px;
19+
font-size: 20px;
20+
line-height: 1.4;
21+
color: #737373;
22+
background: #f0f0f0;
23+
-webkit-text-size-adjust: 100%;
24+
-ms-text-size-adjust: 100%;
25+
}
26+
27+
html,
28+
input {
29+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
30+
}
31+
32+
body {
33+
max-width: 500px;
34+
_width: 500px;
35+
padding: 30px 20px 50px;
36+
border: 1px solid #b3b3b3;
37+
border-radius: 4px;
38+
margin: 0 auto;
39+
box-shadow: 0 1px 10px #a7a7a7, inset 0 1px 0 #fff;
40+
background: #fcfcfc;
41+
}
42+
43+
h1 {
44+
margin: 0 10px;
45+
font-size: 50px;
46+
text-align: center;
47+
}
48+
49+
h1 span {
50+
color: #bbb;
51+
}
52+
53+
h3 {
54+
margin: 1.5em 0 0.5em;
55+
}
56+
57+
p {
58+
margin: 1em 0;
59+
}
60+
61+
ul {
62+
padding: 0 0 0 40px;
63+
margin: 1em 0;
64+
}
65+
66+
.container {
67+
max-width: 380px;
68+
_width: 380px;
69+
margin: 0 auto;
70+
}
71+
72+
/* google search */
73+
74+
#goog-fixurl ul {
75+
list-style: none;
76+
padding: 0;
77+
margin: 0;
78+
}
79+
80+
#goog-fixurl form {
81+
margin: 0;
82+
}
83+
84+
#goog-wm-qt,
85+
#goog-wm-sb {
86+
border: 1px solid #bbb;
87+
font-size: 16px;
88+
line-height: normal;
89+
vertical-align: top;
90+
color: #444;
91+
border-radius: 2px;
92+
}
93+
94+
#goog-wm-qt {
95+
width: 220px;
96+
height: 20px;
97+
padding: 5px;
98+
margin: 5px 10px 0 0;
99+
box-shadow: inset 0 1px 1px #ccc;
100+
}
101+
102+
#goog-wm-sb {
103+
display: inline-block;
104+
height: 32px;
105+
padding: 0 10px;
106+
margin: 5px 0 0;
107+
white-space: nowrap;
108+
cursor: pointer;
109+
background-color: #f5f5f5;
110+
background-image: -webkit-linear-gradient(rgba(255,255,255,0), #f1f1f1);
111+
background-image: -moz-linear-gradient(rgba(255,255,255,0), #f1f1f1);
112+
background-image: -ms-linear-gradient(rgba(255,255,255,0), #f1f1f1);
113+
background-image: -o-linear-gradient(rgba(255,255,255,0), #f1f1f1);
114+
-webkit-appearance: none;
115+
-moz-appearance: none;
116+
appearance: none;
117+
*overflow: visible;
118+
*display: inline;
119+
*zoom: 1;
120+
}
121+
122+
#goog-wm-sb:hover,
123+
#goog-wm-sb:focus {
124+
border-color: #aaa;
125+
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
126+
background-color: #f8f8f8;
127+
}
128+
129+
#goog-wm-qt:hover,
130+
#goog-wm-qt:focus {
131+
border-color: #105cb6;
132+
outline: 0;
133+
color: #222;
134+
}
135+
136+
input::-moz-focus-inner {
137+
padding: 0;
138+
border: 0;
139+
}
140+
</style>
141+
</head>
142+
<body>
143+
<div class="container">
144+
<h1>Not found <span>:(</span></h1>
145+
<p>Sorry, but the page you were trying to view does not exist.</p>
146+
<p>It looks like this was the result of either:</p>
147+
<ul>
148+
<li>a mistyped address</li>
149+
<li>an out-of-date link</li>
150+
</ul>
151+
<script>
152+
var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2),GOOG_FIXURL_SITE = location.host;
153+
</script>
154+
<script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
155+
</div>
156+
</body>
157+
</html>

‎_layouts/default.html

+123-67
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,131 @@
11
<!DOCTYPE html>
2+
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
3+
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
4+
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
5+
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
6+
<head>
7+
<meta charset="utf-8">
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
9+
<title>{{ page.title }}</title>
10+
<meta name="description" content="">
11+
<meta name="viewport" content="width=device-width">
212

3-
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
4-
<head>
5-
<meta charset="utf-8" />
6-
<title>{{ page.title }}</title>
7-
<link href='http://fonts.googleapis.com/css?family=Orienta' rel='stylesheet' type='text/css'>
8-
<link rel="stylesheet" type="text/css" href="/style.css" />
9-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
10-
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
11-
<script src="/script.js" type="text/javascript"></script>
12-
</head>
13-
<body>
14-
<div id="outer1"><div id="outer2"><div id="inner">
13+
<link href='http://fonts.googleapis.com/css?family=Orienta' rel='stylesheet' type='text/css'>
14+
<link rel="stylesheet" href="/css/bootstrap.min.css">
15+
<link rel="stylesheet" href="/css/bootstrap-responsive.min.css">
16+
<link rel="stylesheet" href="/css/main.css">
1517

16-
<div id="menu-left" class="menu">
17-
<a href="index.html"><img src="/img/logo.png" id="logo" alt="F#. Part of the program." /></a>
18-
19-
<h3>About</h3>
20-
<ul>
21-
<li>About F#</li>
22-
<li><a href="http://msdn.microsoft.com/library/vstudio/dd233154.aspx">Documentation</a></li>
23-
<li><a href="http://research.microsoft.com/en-us/um/cambridge/projects/fsharp/manual/spec.pdf">F# specification</a> (PDF)</li>
24-
<li>Development guide</li>
25-
<li><a href="http://preview.tryfsharp.org/Learn">Learning F#</a></li>
26-
</ul>
18+
<script src="/js/vendor/modernizr-2.6.1.min.js"></script>
19+
</head>
20+
<body>
21+
<!--[if lt IE 7]>
22+
<p class="chromeframe">You are using an outdated browser. <a href="http://browsehappy.com/">Upgrade your browser today</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to better experience this site.</p>
23+
<![endif]-->
24+
<div class="navbar navbar navbar-fixed-top">
25+
<div class="navbar-inner">
26+
<div class="container">
27+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
28+
<span class="icon-bar"></span>
29+
<span class="icon-bar"></span>
30+
<span class="icon-bar"></span>
31+
</a>
32+
<a class="brand" href="#">F# Software Foundation</a>
33+
<div class="nav-collapse collapse">
34+
<ul class="nav">
35+
<li class="active"><a href="/">Home</a></li>
36+
<li><a href="/foundation.html">Foundation</a></li>
37+
<li><a href="/math/">Math</a></li>
38+
</ul>
39+
</div><!--/.nav-collapse -->
40+
</div>
41+
</div>
42+
</div>
2743

28-
<h3>Getting F#</h3>
29-
<ul>
30-
<li><a href="http://fsxplat.codeplex.com/wikipage?title=FSharpMac">F# on Mac</a></li>
31-
<li><a href="http://fsxplat.codeplex.com/wikipage?title=FSharpLinux">F# on Linux</a></li>
32-
<li><a href="http://fsxplat.codeplex.com/wikipage?title=FSharpWindows">F# on Windows</a></li>
33-
<li><a href="http://fsxplat.codeplex.com/wikipage?title=FSharpAndroid">F# on Android</a> and <a href="http://fsxplat.codeplex.com/wikipage?title=FSharpIOS">iOS</a></li>
34-
<li><a href="http://fsxplat.codeplex.com/">F# on HTML5, GPGPU<br /> and more...</a></li>
35-
</ul>
44+
<div class="container">
45+
<div class="row">
46+
<div class="span3">
47+
<a href="index.html"><img src="/img/logo.png" id="logo" alt="F#. Part of the program." /></a>
48+
</div>
49+
<div class="span9">
50+
<h1>{{ page.headline }}</h1>
51+
</div>
52+
</div>
53+
<div class="row">
54+
<div class="span3">
55+
<h4>About</h4>
56+
<ul>
57+
<li>About F#</li>
58+
<li><a href="http://msdn.microsoft.com/library/vstudio/dd233154.aspx">Documentation</a></li>
59+
<li><a href="http://research.microsoft.com/en-us/um/cambridge/projects/fsharp/manual/spec.pdf">F# specification</a> (PDF)</li>
60+
<li>Development guide</li>
61+
<li><a href="http://preview.tryfsharp.org/Learn">Learning F#</a></li>
62+
</ul>
3663

37-
<h3>Community</h3>
38-
<ul>
39-
<li><a href="http://groups.google.com/group/fsharp-opensource">F# open source list</a></li>
40-
<li><a href="http://fpish.net/blogs/Some/1/f~23/0">News from F# blogs</a></li>
41-
<li><a href="https://github.com/fsharp/">GitHub</a> and <a href="http://www.codeplex.com/site/search?query=&sortBy=Relevance&tagName=%2cF%23%2c">CodePlex</a> projects</li>
42-
<li><a href="http://www.fssnip.net/">F# code snippets</a></li>
43-
<li><a href="http://stackoverflow.com/questions/tagged/f%23">Ask on StackOverflow</a></li>
44-
<li><a href="http://twitter.com/#fsharp">Join Twitter conversations</a></li>
45-
<li><a href="http://en.irc2go.com/webchat/?net=freenode&room=%23fsharp">F# on IRC</a></li>
46-
<li>Join User Groups
47-
<ul>
48-
<li><a href="http://www.meetup.com/Chicago-F-Users/">Chicago</a></li>
49-
<li><a href="http://www.meetup.com/FSharpLondon/">London</a></li>
50-
<li><a href="http://www.meetup.com/New-England-F-Users-Group/">New England</a></li>
51-
<li><a href="http://www.meetup.com/nyc-fsharp/">New York</a></li>
52-
<li><a href="http://www.sfsharp.org/">San Francisco</a></li>
53-
<li><a href="http://www.meetup.com/zurich-fsharp-users/">Zurich</a></li>
54-
</ul>
55-
</li>
56-
</ul>
64+
<h4>Getting F#</h4>
65+
<ul>
66+
<li><a href="http://fsxplat.codeplex.com/wikipage?title=FSharpMac">F# on Mac</a></li>
67+
<li><a href="http://fsxplat.codeplex.com/wikipage?title=FSharpLinux">F# on Linux</a></li>
68+
<li><a href="http://fsxplat.codeplex.com/wikipage?title=FSharpWindows">F# on Windows</a></li>
69+
<li><a href="http://fsxplat.codeplex.com/wikipage?title=FSharpAndroid">F# on Android</a> and <a href="http://fsxplat.codeplex.com/wikipage?title=FSharpIOS">iOS</a></li>
70+
<li><a href="http://fsxplat.codeplex.com/">F# on HTML5, GPGPU<br /> and more...</a></li>
71+
</ul>
5772

58-
<h3>Foundation</h3>
59-
<ul>
60-
<li><a href="foundation.html">Mission statement</a></li>
61-
<li><a href="foundation.html#funding">Funding</a></li>
62-
<li><a href="foundation.html#members">Members</a></li>
63-
</ul>
64-
</div>
73+
<h4>Community</h4>
74+
<ul>
75+
<li><a href="http://groups.google.com/group/fsharp-opensource">F# open source list</a></li>
76+
<li><a href="http://fpish.net/blogs/Some/1/f~23/0">News from F# blogs</a></li>
77+
<li><a href="https://github.com/fsharp/">GitHub</a> and <a href="http://www.codeplex.com/site/search?query=&sortBy=Relevance&tagName=%2cF%23%2c">CodePlex</a> projects</li>
78+
<li><a href="http://www.fssnip.net/">F# code snippets</a></li>
79+
<li><a href="http://stackoverflow.com/questions/tagged/f%23">Ask on StackOverflow</a></li>
80+
<li><a href="http://twitter.com/#fsharp">Join Twitter conversations</a></li>
81+
<li><a href="http://en.irc2go.com/webchat/?net=freenode&room=%23fsharp">F# on IRC</a></li>
82+
<li>Join User Groups
83+
<ul>
84+
<li><a href="http://www.meetup.com/Chicago-F-Users/">Chicago</a></li>
85+
<li><a href="http://www.meetup.com/FSharpLondon/">London</a></li>
86+
<li><a href="http://www.meetup.com/New-England-F-Users-Group/">New England</a></li>
87+
<li><a href="http://www.meetup.com/nyc-fsharp/">New York</a></li>
88+
<li><a href="http://www.sfsharp.org/">San Francisco</a></li>
89+
<li><a href="http://www.meetup.com/zurich-fsharp-users/">Zurich</a></li>
90+
</ul>
91+
</li>
92+
</ul>
6593

66-
{{ content }}
94+
<h4>Foundation</h4>
95+
<ul>
96+
<li><a href="foundation.html">Mission statement</a></li>
97+
<li><a href="foundation.html#funding">Funding</a></li>
98+
<li><a href="foundation.html#members">Members</a></li>
99+
</ul>
100+
</div>
101+
<div class="span9">
102+
{{ content }}
103+
</div>
104+
</div>
105+
<div class="row">
106+
<div class="span12">
107+
<footer>
108+
<hr />
109+
<p>Copyright &copy; 2012, The F# Software Foundation. Web site is maintained by the <a href="https://github.com/fsharp/fsfoundation" target="_blank">F# community on GitHub.</a></p>
110+
</footer>
111+
</div>
112+
</div>
113+
</div>
114+
</div>
67115

68-
<div id="footer">
69-
Copyright &copy; 2012, The F# Software Foundation.
70-
Web site is maintained by the F# community on <a href="https://github.com/fsharp/fsfoundation">GitHub</a>.
71-
</div>
72-
73-
</div></div></div>
74-
</body>
75-
</html>
116+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
117+
<script>window.jQuery || document.write('<script src="/js/vendor/jquery-1.8.2.min.js"><\/script>')</script>
118+
119+
<script src="/js/vendor/bootstrap.min.js"></script>
120+
121+
<script src="/js/plugins.js"></script>
122+
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
123+
<script src="/js/main.js"></script>
124+
<!-- <script>
125+
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
126+
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
127+
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
128+
s.parentNode.insertBefore(g,s)}(document,'script'));
129+
</script> -->
130+
</body>
131+
</html>

‎_layouts/page.html

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
layout: default
33
---
44

5-
<h1>The F# Software Foundation</h1>
6-
7-
<div id="main2" class="main">
8-
9-
<h2 class="first">{{ page.subtitle }}</h2>
10-
{{ content }}
11-
5+
<div class="row">
6+
<div class="span9">
7+
{{ content }}
8+
</div>
129
</div>

0 commit comments

Comments
 (0)