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

Merge branch 'update-template-no-css' of... 

Merge branch 'update-template-no-css' of github.com:fmichonneau/lesson-template into update-template-no-css
parents 3ccaff61 4b3098fe

01-one.html

+4 −7
Original line number Diff line number Diff line
@@ -7,10 +7,7 @@ 
    <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-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 -->
@@ -19,14 +16,14 @@ 
    <![endif]-->

  </head>

  <body class="lesson">

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

    <div class="container">

      <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>

      <div class="row-fluid">

        <div class="span10 offset1">

      <div class="row">

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

          <h1 class="title">Lesson Title</h1>

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

<div id="learning-objectives" class="objectives">
@@ -67,6 +64,6 @@ program</code></pre> 
    </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="http://software-carpentry.org/v5/js/bootstrap/bootstrap.min.js"></script>

    <script src="css/bootstrap/bootstrap-js/bootstrap.js"></script>

  </body>

</html>

02-two.html

+4 −7
Original line number Diff line number Diff line
@@ -7,10 +7,7 @@ 
    <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-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 -->
@@ -19,14 +16,14 @@ 
    <![endif]-->

  </head>

  <body class="lesson">

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

    <div class="container">

      <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>

      <div class="row-fluid">

        <div class="span10 offset1">

      <div class="row">

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

          <h1 class="title">Lesson Title</h1>

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

<div id="learning-objectives" class="objectives">
@@ -63,6 +60,6 @@ program</code></pre> 
    </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="http://software-carpentry.org/v5/js/bootstrap/bootstrap.min.js"></script>

    <script src="css/bootstrap/bootstrap-js/bootstrap.js"></script>

  </body>

</html>

LICENSE.html

+4 −7
Original line number Diff line number Diff line
@@ -7,10 +7,7 @@ 
    <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-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 -->
@@ -19,14 +16,14 @@ 
    <![endif]-->

  </head>

  <body class="lesson">

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

    <div class="container">

      <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>

      <div class="row-fluid">

        <div class="span10 offset1">

      <div class="row">

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

          <h1 class="title">Licenses</h1>

          

<h3 id="instructional-material">Instructional Material</h3>
@@ -68,6 +65,6 @@ 
    </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="http://software-carpentry.org/v5/js/bootstrap/bootstrap.min.js"></script>

    <script src="css/bootstrap/bootstrap-js/bootstrap.js"></script>

  </body>

</html>

_includes/header.html

+0 −3
Original line number Diff line number Diff line 
<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-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 -->

_includes/javascript.html

+1 −1
Original line number Diff line number Diff line 
<!-- 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>
 
<script src="css/bootstrap/bootstrap-js/bootstrap.js"></script>