Commit 2bea4fb5 authored by Greg Wilson's avatar Greg Wilson Committed by GitHub
Browse files

Merge pull request #36 from gvwilson/gh-pages 

Merging new styles and documentation
parents 26fbce29 cffaeca3

.gitignore

+5 −8
Original line number Diff line number Diff line 
README.html

LAYOUT.html

FAQ.html

DESIGN.html

CONTRIBUTING.html

CONDUCT.html

*~

*.pyc

_site

*~

.DS_Store

.ipynb_checkpoints

.sass-cache

__pycache__

_site

.mailmap

+27 −6
Original line number Diff line number Diff line 
James Allen <jamesallen0108@gmail.com>

Pete Bachant <petebachant@gmail.com>

Piotr Banaszkiewicz <piotr@banaszkiewicz.org>

David Beitey <david@davidjb.com>

Trevor Bekolay <tbekolay@gmail.com>

John Blischak <jdblischak@gmail.com>

Andy Boughton <abought@gmail.com> <pchemist@gmail.com>

Amy Brown <amyrhoda@gmail.com> <arbrown@latte.ca>

Abigail Cabunoc <abigail.cabunoc@gmail.com> <abigail.cabunoc@oicr.on.ca>

Jonah Duckles <jonah@duckles.org>

Rémi Emonet <remi@heeere.com> <remi.emonet@univ-st-etienne.fr>

Ivan Gonzalez <iglpdc@gmail.com>

Michael Hansen <hansen.mike@gmail.com>

Mike Jackson <michaelj@epcc.ed.ac.uk>

W. Trevor King <wking@tremily.us>

Christina Koch <christinakconnect@gmail.com>

Alexander Konovalov <alexander.konovalov@st-andrews.ac.uk>

Francois Michonneau <francois.michonneau@gmail.com>

Bill Mills <mills.wj@gmail.com>

Aaron O'Leary <aaron.oleary@gmail.com>

Jon Pipitone <jon.pipitone@utoronto.ca>

Timothée Poisot <tim@poisotlab.io>

Florian Rathgeber <florian.rathgeber@gmail.com>

Ariel Rokem <arokem@gmail.com>

Raniere Silva <ra092767@ime.unicamp.br> <raniere@ime.unicamp.br> <raniere@rgaiacs.com>

Ashwin Srinath <atrikut@clemson.edu>

Carol Willing <carolcode@willingconsulting.com>

Greg Wilson <gvwilson@software-carpentry.org> <gvwilson@third-bit.com>

Abigail Cabunoc <abigail.cabunoc@oicr.on.ca> <abigail.cabunoc@gmail.com>

Francois Michonneau <francois.michonneau@gmail.com> <francois.michonneau@gmail.Com>

Raniere Silva <raniere@ime.unicamp.br> <ra092767@ime.unicamp.br>

Amy Brown <arbrown@latte.ca> <amyrhoda@gmail.com>

Ivan Gonzalez <iglpdc@gmail.com> <iglpdc@users.noreply.github.com>

Michael Jackson <michaelj@epcc.ed.ac.uk>
 
Naupaka Zimmerman <naupaka@gmail.com>

01-one.html

deleted100644 → 0
+0 −84
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html>

  <head>

    <meta charset="utf-8">

    <meta name="generator" content="pandoc">

    <title>Software Carpentry: Lesson Title</title>

    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />

    <meta name="viewport" content="width=device-width, initial-scale=1.0" />

    <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.css" />

    <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-theme.css" />

    <link rel="stylesheet" type="text/css" href="css/swc.css" />

    <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>

    <meta charset="UTF-8" />

    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->

    <!--[if lt IE 9]>

      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>

    <![endif]-->

  </head>

  <body class="lesson">

    <div class="container card">

      <div class="banner">

        <a href="http://software-carpentry.org" title="Software Carpentry">

          <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />

        </a>

      </div>

      <article>

      <div class="row">

        <div class="col-md-10 col-md-offset-1">

                    <a href="index.html"><h1 class="title">Lesson Title</h1></a>

          <h2 class="subtitle">Topic Title One</h2>

          <section class="objectives panel panel-warning">

<div class="panel-heading">

<h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>

</div>

<div class="panel-body">

<ul>

<li>Learning objective 1</li>

<li>Learning objective 2</li>

</ul>

</div>

</section>

<p>Paragraphs of text — possibly including <a href="reference.html#key-word-1">key word 1</a> — mixed with:</p>

<pre class="sourceCode python"><code class="sourceCode python">some code:

    to be displayed</code></pre>

<pre class="output"><code>output

from

program</code></pre>

<pre class="error"><code>error reports from program (if any)</code></pre>

<p>and possibly including:</p>

<aside class="callout panel panel-info">

<div class="panel-heading">

<h2><span class="glyphicon glyphicon-pushpin"></span>Callout Box</h2>

</div>

<div class="panel-body">

<p>An aside of some kind.</p>

</div>

</aside>

<p>or an image from the <code>figs</code> directory:</p>

<div class="figure">

<img src="fig/example.svg" title="this is the image&#39;s alt text" alt="this is the image’s title" /><p class="caption">this is the image’s title</p>

</div>

<section class="challenge panel panel-success">

<div class="panel-heading">

<h2><span class="glyphicon glyphicon-pencil"></span>Challenge Title</h2>

</div>

<div class="panel-body">

<p>Description of a single challenge. There may be several challenges.</p>

</div>

</section>

        </div>

      </div>

      </article>

      <div class="footer">

        <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>

        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>

        <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>

        <a class="label swc-blue-bg" href="LICENSE.html">License</a>

      </div>

    </div>

    <!-- 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="css/bootstrap/bootstrap-js/bootstrap.js"></script>

  </body>

</html>

01-one.md

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
---

layout: page

title: Lesson Title

subtitle: Topic Title One

minutes: 10

---

> ## Learning Objectives {.objectives}

>

> * Learning objective 1

> * Learning objective 2



Paragraphs of text

--- possibly including [key word 1](reference.html#key-word-1) ---

mixed with:



~~~ {.python}

some code:

    to be displayed

~~~

~~~ {.output}

output

from

program

~~~

~~~ {.error}

error reports from program (if any)

~~~



and possibly including:



> ## Callout Box {.callout}

>

> An aside of some kind.



or an image from the `figs` directory:



![this is the image's title](fig/example.svg "this is the image's alt text")



> ## Challenge Title {.challenge}

>

> Description of a single challenge.

> There may be several challenges.

02-two.html

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html>

  <head>

    <meta charset="utf-8">

    <meta name="generator" content="pandoc">

    <title>Software Carpentry: Lesson Title</title>

    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />

    <meta name="viewport" content="width=device-width, initial-scale=1.0" />

    <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.css" />

    <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-theme.css" />

    <link rel="stylesheet" type="text/css" href="css/swc.css" />

    <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>

    <meta charset="UTF-8" />

    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->

    <!--[if lt IE 9]>

      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>

    <![endif]-->

  </head>

  <body class="lesson">

    <div class="container card">

      <div class="banner">

        <a href="http://software-carpentry.org" title="Software Carpentry">

          <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />

        </a>

      </div>

      <article>

      <div class="row">

        <div class="col-md-10 col-md-offset-1">

                    <a href="index.html"><h1 class="title">Lesson Title</h1></a>

          <h2 class="subtitle">Topic Title Two</h2>

          <section class="objectives panel panel-warning">

<div class="panel-heading">

<h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>

</div>

<div class="panel-body">

<ul>

<li>Learning objective 1</li>

<li>Learning objective 2</li>

</ul>

</div>

</section>

<p>Paragraphs of text — possibly including <a href="reference.html#key-word-2">key word 2</a> — mixed with:</p>

<pre class="sourceCode python"><code class="sourceCode python">some code:

    to be displayed</code></pre>

<pre class="output"><code>output

from

program</code></pre>

<pre class="error"><code>error reports from program (if any)</code></pre>

<p>and possibly including:</p>

<aside class="callout panel panel-info">

<div class="panel-heading">

<h2><span class="glyphicon glyphicon-pushpin"></span>Callout Box</h2>

</div>

<div class="panel-body">

<p>An aside of some kind.</p>

</div>

</aside>

<section class="challenge panel panel-success">

<div class="panel-heading">

<h2><span class="glyphicon glyphicon-pencil"></span>Challenge Title</h2>

</div>

<div class="panel-body">

<p>Description of a single challenge. There may be several challenges that make reference to <a href="01-one.html#challenge-title">Challenge Title</a>.</p>

</div>

</section>

        </div>

      </div>

      </article>

      <div class="footer">

        <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>

        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>

        <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>

        <a class="label swc-blue-bg" href="LICENSE.html">License</a>

      </div>

    </div>

    <!-- 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="css/bootstrap/bootstrap-js/bootstrap.js"></script>

  </body>

</html>