Skip to content
Snippets Groups Projects
Commit 8a3ac1bd authored by Trevor Bekolay's avatar Trevor Bekolay
Browse files

Merge pull request #1 from gvwilson/gh-pages 

Using template variables everywhere

- Fixed error in header.html; missing }
parents 6ea657ce fbd66b28
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
_config.yml
+ 2
− 4
View file @ 8a3ac1bd
markdown : kramdown
kramdown :
entity_output : as_input # — is output as —
entity_output : as_input # so that — is output as —
smart_quotes : [39, 39, 34, 34] # decimal for left/right single/double quotes
contact : "admin@software-carpentry.org"
github_url : "https://github.com/swcarpentry"
irc_url : "irc://moznet/sciencelab"
rss_url : "http://software-carpentry.org/feed.xml"
swc_prefix : "http://software-carpentry.org"
swc_url : "http://software-carpentry.org"
twitter_name : "@swcarpentry"
twitter_url : "https://twitter.com/swcarpentry"
_includes/banner.html
+ 3
− 3
View file @ 8a3ac1bd
<span id="github-ribbon"><a href="https://github.com/swcarpentry/bc">Fork me on GitHub</a></span>
<span id="github-ribbon"><a href="{{site.github_url}}/bc">Fork me on GitHub</a></span>
<div class="banner">
<a href="http://software-carpentry.org" title="Software Carpentry">
<img alt="Software Carpentry banner" src="http://software-carpentry.org/v5/img/software-carpentry-banner.png" />
<a href="{{site.swc_url}}" title="Software Carpentry">
<img alt="Software Carpentry banner" src="{{site.swc_url}}/v5/img/software-carpentry-banner.png" />
</a>
</div>
_includes/footer.html
+ 0
− 2
View file @ 8a3ac1bd
<div class="footer">
<a class="label swc-blue-bg" href="mailto:{{site.contact}}">Email</a>
<a class="label swc-blue-bg" href="{{site.twitter_url}}">Twitter</a>
<a class="label swc-blue-bg" href="{{site.rss_url}}">RSS</a>
<a class="label swc-blue-bg" href="{{site.github_url}}">GitHub</a>
<a class="label swc-blue-bg" href="{{site.irc_url}}">IRC</a>
<a class="label swc-blue-bg" href="/LICENSE.html">License</a>
<a class="bugreport label swc-blue-bg" href="mailto:{{site.contact}}?subject=bug%20in%20{{page.path}}">Bug Report</a>
</div>
_includes/header.html
+ 5
− 5
View file @ 8a3ac1bd
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<link href="http://software-carpentry.org/v5/css/bootstrap/bootstrap.css" rel="stylesheet" />
<link href="{{site.swc_url}}/v5/css/bootstrap/bootstrap.css" rel="stylesheet" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="http://software-carpentry.org/v5/css/bootstrap/bootstrap-responsive.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="http://software-carpentry.org/v5/css/swc.css" />
<link rel="stylesheet" type="text/css" href="http://software-carpentry.org/v5/css/swc-bootstrap.css" />
<link rel="alternate" type="application/rss+xml" title="The Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
<link href="{{site.swc_url}}/v5/css/bootstrap/bootstrap-responsive.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="{{site.swc_url}}/v5/css/swc.css" />
<link rel="stylesheet" type="text/css" href="{{site.swc_url}}/v5/css/swc-bootstrap.css" />
<link rel="alternate" type="application/rss+xml" title="The Software Carpentry Blog" href="{{site.swc_url}}/feed.xml"/>
<meta charset="UTF-8" />
<meta http-equiv="last-modified" content="{{site.timestamp}}" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
......
_includes/javascript.html
+ 1
− 3
View file @ 8a3ac1bd
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<!-- Javascript placed at the end of the document so the pages load faster -->
<script src="http://software-carpentry.org/v5/js/jquery-1.9.1.min.js"></script>
<script src="http://software-carpentry.org/v5/js/bootstrap/bootstrap.min.js"></script>
_layouts/lesson.html
+ 1
− 1
View file @ 8a3ac1bd
......@@ -7,7 +7,7 @@
<title>{{ page.title }}</title>
{% endif %}
{% include header.html %}
<link rel="stylesheet" type="text/css" href="http://software-carpentry.org/v5/css/lesson.css" />
<link rel="stylesheet" type="text/css" href="{{site.swc_url}}/v5/css/lesson.css" />
</head>
<body>
<div class="container">
......
_layouts/reference.html
+ 1
− 1
View file @ 8a3ac1bd
......@@ -7,7 +7,7 @@
<title>{{ page.title }}</title>
{% endif %}
{% include header.html %}
<link rel="stylesheet" type="text/css" href="http://software-carpentry.org/v5/css/lesson.css" />
<link rel="stylesheet" type="text/css" href="{{site.swc_url}}/v5/css/lesson.css" />
</head>
<body>
<div class="container">
......
_layouts/slides.html
+ 12
− 12
View file @ 8a3ac1bd
......@@ -10,10 +10,10 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<link rel="stylesheet" href="http://software-carpentry.org/v5/reveal.js/css/reveal.min.css" />
<link rel="stylesheet" href="http://software-carpentry.org/v5/reveal.js/css/theme/swc_slides.css" id="theme" />
<link rel="stylesheet" href="http://software-carpentry.org/v5/css/swc-bootstrap.css" id="theme" />
<link rel="stylesheet" href="http://software-carpentry.org/v5/css/bootstrap/bootstrap.css" id="theme" />
<link rel="stylesheet" href="{{site.swc_url}}/v5/reveal.js/css/reveal.min.css" />
<link rel="stylesheet" href="{{site.swc_url}}/v5/reveal.js/css/theme/swc_slides.css" id="theme" />
<link rel="stylesheet" href="{{site.swc_url}}/v5/css/swc-bootstrap.css" id="theme" />
<link rel="stylesheet" href="{{site.swc_url}}/v5/css/bootstrap/bootstrap.css" id="theme" />
<!--[if lt IE 9]>
<script src="lib/js/html5shiv.js"></script>
<![endif]-->
......@@ -227,8 +227,8 @@
<h3>{{page.website}}</h3>
</div>
<script src="http://software-carpentry.org/v5/reveal.js/lib/js/head.min.js"></script>
<script src="http://software-carpentry.org/v5/reveal.js/js/reveal.min.js"></script>
<script src="{{site.swc_url}}/v5/reveal.js/lib/js/head.min.js"></script>
<script src="{{site.swc_url}}/v5/reveal.js/js/reveal.min.js"></script>
<script>
// Full list of configuration options available at http://github.com/hakimel/reveal.js#configuration.
......@@ -246,12 +246,12 @@
// Optional libraries used to extend on reveal.js
dependencies: [
{ src: 'http://software-carpentry.org/v5/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: 'http://software-carpentry.org/v5/reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'http://software-carpentry.org/v5/reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'http://software-carpentry.org/v5/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: 'http://software-carpentry.org/v5/reveal.js/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'http://software-carpentry.org/v5/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
{ src: '{{site.swc_url}}/v5/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: '{{site.swc_url}}/v5/reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: '{{site.swc_url}}/v5/reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: '{{site.swc_url}}/v5/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: '{{site.swc_url}}/v5/reveal.js/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: '{{site.swc_url}}/v5/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
]
});
......
_layouts/topic.html
+ 1
− 1
View file @ 8a3ac1bd
......@@ -7,7 +7,7 @@
<title>{{ page.title }}</title>
{% endif %}
{% include header.html %}
<link rel="stylesheet" type="text/css" href="http://software-carpentry.org/v5/css/lesson.css" />
<link rel="stylesheet" type="text/css" href="{{site.swc_url}}/v5/css/lesson.css" />
</head>
<body>
<div class="container">
......
index.md
+ 1
− 1
View file @ 8a3ac1bd
......@@ -5,7 +5,7 @@ keywords: ["some", "key terms", "in a list"]
---
Paragraph of introductory material.
> ## Prerequisites {.prereq}
> ## Prerequisites
>
> A short paragraph describing what learners need to know
> before tackling this lesson.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment