Skip to content

Commit 395ff74

Browse files
swlaschinswlaschin
committedFeb 12, 2017
Updated to markdown version of site
1 parent 43e76ae commit 395ff74

31 files changed

+2040
-3180
lines changed
 

Diff for: ‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
/_junk
1+
_site
2+
.sass-cache
3+
.jekyll-metadata

Diff for: ‎Gemfile

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
source "https://rubygems.org"
2+
ruby RUBY_VERSION
3+
4+
# Hello! This is where you manage which Jekyll version is used to run.
5+
# When you want to use a different version, change it below, save the
6+
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
7+
#
8+
# bundle exec jekyll serve
9+
#
10+
# This will help ensure the proper Jekyll version is running.
11+
# Happy Jekylling!
12+
gem "jekyll", "3.3.1"
13+
14+
# This is the default theme for new Jekyll sites. You may change this to anything you like.
15+
gem "minima", "~> 2.0"
16+
17+
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
18+
# uncomment the line below. To upgrade, run `bundle update github-pages`.
19+
# gem "github-pages", group: :jekyll_plugins
20+
21+
# If you have any plugins, put them here!
22+
group :jekyll_plugins do
23+
gem "jekyll-feed", "~> 0.6"
24+
end

Diff for: ‎Gemfile.lock

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
addressable (2.5.0)
5+
public_suffix (~> 2.0, >= 2.0.2)
6+
colorator (1.1.0)
7+
ffi (1.9.17)
8+
forwardable-extended (2.6.0)
9+
jekyll (3.3.1)
10+
addressable (~> 2.4)
11+
colorator (~> 1.0)
12+
jekyll-sass-converter (~> 1.0)
13+
jekyll-watch (~> 1.1)
14+
kramdown (~> 1.3)
15+
liquid (~> 3.0)
16+
mercenary (~> 0.3.3)
17+
pathutil (~> 0.9)
18+
rouge (~> 1.7)
19+
safe_yaml (~> 1.0)
20+
jekyll-feed (0.8.0)
21+
jekyll (~> 3.3)
22+
jekyll-sass-converter (1.5.0)
23+
sass (~> 3.4)
24+
jekyll-watch (1.5.0)
25+
listen (~> 3.0, < 3.1)
26+
kramdown (1.13.2)
27+
liquid (3.0.6)
28+
listen (3.0.8)
29+
rb-fsevent (~> 0.9, >= 0.9.4)
30+
rb-inotify (~> 0.9, >= 0.9.7)
31+
mercenary (0.3.6)
32+
minima (2.1.0)
33+
jekyll (~> 3.3)
34+
pathutil (0.14.0)
35+
forwardable-extended (~> 2.6)
36+
public_suffix (2.0.5)
37+
rb-fsevent (0.9.8)
38+
rb-inotify (0.9.8)
39+
ffi (>= 0.5.0)
40+
rouge (1.11.1)
41+
safe_yaml (1.0.4)
42+
sass (3.4.23)
43+
44+
PLATFORMS
45+
ruby
46+
47+
DEPENDENCIES
48+
jekyll (= 3.3.1)
49+
jekyll-feed (~> 0.6)
50+
minima (~> 2.0)

Diff for: ‎_config.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Welcome to Jekyll!
2+
#
3+
# This config file is meant for settings that affect your whole blog, values
4+
# which you are expected to set up once and rarely edit after that. If you find
5+
# yourself editing this file very often, consider using Jekyll's data files
6+
# feature for the data you need to update frequently.
7+
#
8+
# For technical reasons, this file is *NOT* reloaded automatically when you use
9+
# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
10+
11+
# Site settings
12+
# These are used to personalize your new site. If you look in the HTML files,
13+
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
14+
# You can create any custom variable you would like, and they will be accessible
15+
# in the templates via {{ site.myvariable }}.
16+
title: FsharpWorks
17+
email: contact@fsharpworks.com
18+
description: > # this means to ignore newlines until "baseurl:"
19+
Write an awesome description for your new site here. You can edit this
20+
line in _config.yml. It will appear in your document head meta (for
21+
Google search results) and in your feed.xml site description.
22+
baseurl: "" # the subpath of your site, e.g. /blog
23+
url: "http://www.fsharpworks.com" # the base hostname & protocol for your site, e.g. http://example.com
24+
twitter_username: jekyllrb
25+
github_username: jekyll
26+
27+
# Build settings
28+
markdown: kramdown
29+
theme: minima
30+
gems:
31+
- jekyll-feed
32+
exclude:
33+
- Gemfile
34+
- Gemfile.lock
35+
- .git/
36+
37+
# Serve settings
38+
port: 8081
39+
host: localhost

Diff for: ‎_includes/navbar.inc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<div class="overlay2">
2+
<div class="container">
3+
<div class="row fw-header">
4+
<ul class="nav nav-pills" id="navbar">
5+
<li class="{% if page.nav == 'Home' %}active{% endif %}"><a href="/index.html">Home</a></li>
6+
<li class="{% if page.nav == 'Workshops' %}active{% endif %}"><a href="/workshops.html">Workshops</a></li>
7+
<li class="{% if page.nav == 'Materials' %}active{% endif %}"><a href="/materials.html">Books and talks</a></li>
8+
<li class="{% if page.nav == 'Testimonials' %}active{% endif %}"><a href="/testimonials.html">Testimonials</a></li>
9+
<li class="{% if page.nav == 'Survey' %}active{% endif %}"><a href="/survey.html">Survey</a></li>
10+
<li class="{% if page.nav == 'Team' %}active{% endif %}"><a href="/team.html">About us</a></li>
11+
</ul>
12+
</div>
13+
</div>
14+
</div>

Diff for: ‎_layouts/default.html

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<link rel="canonical" href="http://www.fsharpworks.com/" />
8+
9+
<title>{% if page.title %}{{ page.title | escape }} | {% endif %}fsharpWorks: F# training and consulting</title>
10+
<meta name="description" content="{{page.description | escape}}" />
11+
<meta name="keywords" content="{{page.keywords | escape }}" />
12+
<meta name="author" content="fsharpWorks">
13+
14+
<!-- generated using http://realfavicongenerator.net/ -->
15+
<link rel="apple-touch-icon" sizes="57x57" href="/icon/apple-touch-icon-57x57.png">
16+
<link rel="apple-touch-icon" sizes="60x60" href="/icon/apple-touch-icon-60x60.png">
17+
<link rel="apple-touch-icon" sizes="72x72" href="/icon/apple-touch-icon-72x72.png">
18+
<link rel="apple-touch-icon" sizes="76x76" href="/icon/apple-touch-icon-76x76.png">
19+
<link rel="apple-touch-icon" sizes="114x114" href="/icon/apple-touch-icon-114x114.png">
20+
<link rel="apple-touch-icon" sizes="120x120" href="/icon/apple-touch-icon-120x120.png">
21+
<link rel="apple-touch-icon" sizes="144x144" href="/icon/apple-touch-icon-144x144.png">
22+
<link rel="apple-touch-icon" sizes="152x152" href="/icon/apple-touch-icon-152x152.png">
23+
<link rel="apple-touch-icon" sizes="180x180" href="/icon/apple-touch-icon-180x180.png">
24+
<link rel="icon" type="image/png" href="/icon/favicon-32x32.png" sizes="32x32">
25+
<link rel="icon" type="image/png" href="/icon/android-chrome-192x192.png" sizes="192x192">
26+
<link rel="icon" type="image/png" href="/icon/favicon-96x96.png" sizes="96x96">
27+
<link rel="icon" type="image/png" href="/icon/favicon-16x16.png" sizes="16x16">
28+
<link rel="manifest" href="/icon/manifest.json">
29+
<link rel="mask-icon" href="/icon/safari-pinned-tab.svg" color="#5bbad5">
30+
<link rel="shortcut icon" href="/icon/favicon.ico">
31+
<meta name="msapplication-TileColor" content="#cccccc">
32+
<meta name="msapplication-TileImage" content="/icon/mstile-144x144.png">
33+
<meta name="msapplication-config" content="/icon/browserconfig.xml">
34+
<meta name="theme-color" content="#ffffff">
35+
36+
<!-- Twitter card -->
37+
{% if page.twitterimage %}
38+
<meta name="twitter:card" content="summary_large_image">
39+
<meta name="twitter:image" content="http://www.fsharpworks.com{{page.image}}">
40+
{% else %}
41+
<meta name="twitter:card" content="summary">
42+
<meta name="twitter:image" content="http://fsharpworks.imgix.net/fsharp_works_logo_100.png">
43+
{% endif %}
44+
<meta name="twitter:site" content="@fsharpWorks">
45+
<meta name="twitter:title" content="{% if page.title %}{{ page.title | escape }} | {% endif %}fsharpWorks: F# training and consulting">
46+
<meta name="twitter:description" content="{{page.description | escape}}">
47+
<meta name="twitter:image:alt" content="fsharpWorks logo">
48+
49+
<!-- Bootstrap core CSS -->
50+
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
51+
52+
<!-- Custom styles for this template -->
53+
<link href='/styles/core-style.css' rel='stylesheet' type='text/css'>
54+
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css" rel="stylesheet">
55+
56+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
57+
<!--[if lt IE 9]>
58+
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
59+
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
60+
<![endif]-->
61+
</head>
62+
63+
<body itemscope itemtype="https://schema.org/Organization">
64+
65+
<div class="container">
66+
<div class="row header fw-logo">
67+
<div class="col-lg-6 col-md-8">
68+
<img itemprop="image" src="http://fsharpworks.imgix.net/fsharp_works_logo_100.png" alt="fsharpWorks logo" class="img-responsive" />
69+
</div>
70+
<div class="col-lg-6 col-md-4 header-tagline">
71+
<h2 class="header-tagline">The safe choice for functional-first development</h2>
72+
</div>
73+
</div>
74+
</div>
75+
76+
77+
{{ content }}
78+
79+
80+
<footer>
81+
<div class="container">
82+
<div class="row footer">
83+
<div class="col-lg-12 text-center">
84+
<p>&copy; fsharpWorks 2016</p>
85+
</div>
86+
</div>
87+
</div>
88+
</footer>
89+
90+
91+
<!-- Bootstrap core JavaScript -->
92+
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
93+
<script src="https://code.jquery.com/jquery-2.2.3.min.js" integrity="sha256-a23g1Nt4dtEYOj7bR+vTu7+T8VP13humZFBJNIYoEJo=" crossorigin="anonymous"></script>
94+
<!-- Include all compiled plugins (below), or include individual files as needed -->
95+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
96+
<!-- Placed at the end of the document so the pages load faster -->
97+
<script>!function (d, s, id) { var js, fjs = d.getElementsByTagName(s)[0]; if (!d.getElementById(id)) { js = d.createElement(s); js.id = id; js.src = "http://platform.twitter.com/widgets.js"; fjs.parentNode.insertBefore(js, fjs); } }(document, "script", "twitter-wjs");</script>
98+
99+
100+
<script>
101+
(function (i, s, o, g, r, a, m) {
102+
i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
103+
(i[r].q = i[r].q || []).push(arguments)
104+
}, i[r].l = 1 * new Date(); a = s.createElement(o),
105+
m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
106+
})(window, document, 'script', 'http://www.google-analytics.com/analytics.js', 'ga');
107+
108+
ga('create', 'UA-50976719-1', 'fsharpworks.com');
109+
ga('send', 'pageview');
110+
111+
</script>
112+
113+
114+
</body>
115+
</html>
116+
117+
118+
119+
120+

Diff for: ‎_layouts/homepage.html

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
layout: default
3+
---
4+
5+
6+
<div class="fw-photos fw-photos-hp">
7+
<div id="fworks-banner" class="carousel slide" data-ride="carousel">
8+
<!-- Content -->
9+
<div class="carousel-inner" role="listbox">
10+
<div class="img1 item active"></div>
11+
<div class="img2 item"></div>
12+
<div class="img3 item"></div>
13+
<div class="img4 item"></div>
14+
<div class="img5 item"></div>
15+
</div>
16+
<div class="overlay">
17+
<link itemprop="url" href="http://fsharpworks.com"/>
18+
<h2>Welcome to <b itemprop="name">fsharpWorks</b></h2>
19+
<p itemprop="description">A team of F# experts that can offer you a complete range of services including F# training, consulting, and functional-first development.</p>
20+
<p class="btns">
21+
<a itemprop="email" class="btn btn-info" href="mailto:info@fsharpworks.com"><i class="fa fa-envelope"></i>&nbsp; Contact Us</a>
22+
<a itemprop="sameAs" class="btn btn-info" href="https://twitter.com/fsharpWorks"><i class="fa fa-twitter"></i>&nbsp; Follow Us</a>
23+
<link itemprop="sameAs" href="https://www.linkedin.com/company/fsharpworks"/>
24+
<link itemprop="sameAs" href="https://github.com/fsharpworks"/>
25+
</p>
26+
</div>
27+
28+
{% include navbar.inc %}
29+
30+
<a class="left carousel-control" href="#fworks-banner" role="button" data-slide="prev">
31+
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
32+
<span class="sr-only">Previous</span>
33+
</a>
34+
<a class="right carousel-control" href="#fworks-banner" role="button" data-slide="next">
35+
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
36+
<span class="sr-only">Next</span>
37+
</a>
38+
</div>
39+
</div>
40+
41+
42+
<div class="container">
43+
{{ content }}
44+
</div> <!-- /container -->
45+

Diff for: ‎_layouts/page.html

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
layout: default
3+
---
4+
5+
6+
<div class="fw-photos fw-photos-subtle">
7+
<div id="fworks-banner" class="carousel slide" data-ride="carousel">
8+
<!-- Content -->
9+
<div class="carousel-inner" role="listbox">
10+
<div class="{{ page.bannerImage }} item active"></div>
11+
</div>
12+
13+
{% include navbar.inc %}
14+
15+
16+
<div class="overlay">
17+
{% if page.banner1 %}
18+
<p>{{ page.banner1 }}</p>
19+
{% endif %}
20+
{% if page.banner2 %}
21+
<p>{{ page.banner2 }}</p>
22+
{% endif %}
23+
</div>
24+
25+
</div>
26+
</div>
27+
28+
29+
<div class="container">
30+
{{ content }}
31+
</div> <!-- /container -->
32+

Diff for: ‎author_notes.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Files should be encoded as UTF-8 no BOM (BOM causes jekyll error)
2+
3+
Use relative paths for links and images so that sit can be tested locally.
4+
5+
html tags with markdown="1" are used for bootstrap rows (see index.md for lots of examples)
6+
When mixing markdown and HTML, html tags MUST start on left margin
7+
8+
9+
YAML header for each page
10+
* title - page title
11+
* description - page title
12+
* nav - if set to "Home" the home button on nav bar is active. Ditto for "Materials", "Team", etc. See navbar.inc in /_includes/
13+
* layout - Which template for the page:
14+
"page" - has a single banner image
15+
"homepage" - has a carousel
16+
The page templates are stored in /_layouts/
17+
* banner1 - html for banner line 1.
18+
* banner2 - html for banner line 2. Inline HTML is OK but no double quotes (use singles)
19+
* bannerImage - CSS id of image for banner ("page" template only) - eg "img1" "img2"

Diff for: ‎favicon.ico

7.23 KB
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.