Commit e5d6ae0c authored by Greg Wilson's avatar Greg Wilson
Browse files

Merging from upstream

parents 3e3919ce 3ccaff61

01-one.html

+6 −4
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ 
    <meta name="generator" content="pandoc">

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

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

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

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

    <link rel="stylesheet" href="css/bootstrap/bootstrap-responsive.css" />

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

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

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

    <link rel="stylesheet" type="text/css" href="css/swc-workshop-and-lesson.css" />

    <link rel="stylesheet" type="text/css" href="css/lesson.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 -->
@@ -16,8 +18,8 @@ 
      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>

    <![endif]-->

  </head>

  <body>

    <div class="container">

  <body class="lesson">

    <div class="container container-full-width card">

      <div class="banner">

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

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

02-two.html

+6 −4
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ 
    <meta name="generator" content="pandoc">

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

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

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

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

    <link rel="stylesheet" href="css/bootstrap/bootstrap-responsive.css" />

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

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

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

    <link rel="stylesheet" type="text/css" href="css/swc-workshop-and-lesson.css" />

    <link rel="stylesheet" type="text/css" href="css/lesson.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 -->
@@ -16,8 +18,8 @@ 
      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>

    <![endif]-->

  </head>

  <body>

    <div class="container">

  <body class="lesson">

    <div class="container container-full-width card">

      <div class="banner">

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

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

LICENSE.html

+6 −4
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ 
    <meta name="generator" content="pandoc">

    <title>Software Carpentry: Licenses</title>

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

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

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

    <link rel="stylesheet" href="css/bootstrap/bootstrap-responsive.css" />

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

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

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

    <link rel="stylesheet" type="text/css" href="css/swc-workshop-and-lesson.css" />

    <link rel="stylesheet" type="text/css" href="css/lesson.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 -->
@@ -16,8 +18,8 @@ 
      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>

    <![endif]-->

  </head>

  <body>

    <div class="container">

  <body class="lesson">

    <div class="container container-full-width card">

      <div class="banner">

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

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

_includes/header.html

+4 −2
Original line number Diff line number Diff line 
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />

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

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

<link rel="stylesheet" href="css/bootstrap/bootstrap-responsive.css" />

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

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

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

<link rel="stylesheet" type="text/css" href="css/swc-workshop-and-lesson.css" />

<link rel="stylesheet" type="text/css" href="css/lesson.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 -->

_layouts/page.html

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
    <title>Software Carpentry: $pagetitle$</title>

    $header$

  </head>

  <body>

    <div class="container">

  <body class="lesson">

    <div class="container container-full-width card">

      $banner$

      <div class="row-fluid">

        <div class="span10 offset1">