Skip to content
Snippets Groups Projects
Commit 4b3098fe authored by François Michonneau's avatar François Michonneau
Browse files

update HTML template to accommodate changes to CSS

this PR replaces #145 which also included the changes to the CSS.
parent 6fdc851e
Branches
Tags
No related merge requests found
...@@ -7,10 +7,7 @@ ...@@ -7,10 +7,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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.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.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"/> <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
...@@ -19,14 +16,14 @@ ...@@ -19,14 +16,14 @@
<![endif]--> <![endif]-->
</head> </head>
<body class="lesson"> <body class="lesson">
<div class="container container-full-width card"> <div class="container">
<div class="banner"> <div class="banner">
<a href="http://software-carpentry.org" title="Software Carpentry"> <a href="http://software-carpentry.org" title="Software Carpentry">
<img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />
</a> </a>
</div> </div>
<div class="row-fluid"> <div class="row">
<div class="span10 offset1"> <div class="col-md-10 col-md-offset-1">
<h1 class="title">Lesson Title</h1> <h1 class="title">Lesson Title</h1>
<h2 class="subtitle">Topic Title One</h2> <h2 class="subtitle">Topic Title One</h2>
<div id="learning-objectives" class="objectives"> <div id="learning-objectives" class="objectives">
...@@ -67,6 +64,6 @@ program</code></pre> ...@@ -67,6 +64,6 @@ program</code></pre>
</div> </div>
<!-- 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/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> </body>
</html> </html>
...@@ -7,10 +7,7 @@ ...@@ -7,10 +7,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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.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.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"/> <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
...@@ -19,14 +16,14 @@ ...@@ -19,14 +16,14 @@
<![endif]--> <![endif]-->
</head> </head>
<body class="lesson"> <body class="lesson">
<div class="container container-full-width card"> <div class="container">
<div class="banner"> <div class="banner">
<a href="http://software-carpentry.org" title="Software Carpentry"> <a href="http://software-carpentry.org" title="Software Carpentry">
<img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />
</a> </a>
</div> </div>
<div class="row-fluid"> <div class="row">
<div class="span10 offset1"> <div class="col-md-10 col-md-offset-1">
<h1 class="title">Lesson Title</h1> <h1 class="title">Lesson Title</h1>
<h2 class="subtitle">Topic Title Two</h2> <h2 class="subtitle">Topic Title Two</h2>
<div id="learning-objectives" class="objectives"> <div id="learning-objectives" class="objectives">
...@@ -63,6 +60,6 @@ program</code></pre> ...@@ -63,6 +60,6 @@ program</code></pre>
</div> </div>
<!-- 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/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> </body>
</html> </html>
...@@ -7,10 +7,7 @@ ...@@ -7,10 +7,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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.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.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"/> <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
...@@ -19,14 +16,14 @@ ...@@ -19,14 +16,14 @@
<![endif]--> <![endif]-->
</head> </head>
<body class="lesson"> <body class="lesson">
<div class="container container-full-width card"> <div class="container">
<div class="banner"> <div class="banner">
<a href="http://software-carpentry.org" title="Software Carpentry"> <a href="http://software-carpentry.org" title="Software Carpentry">
<img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />
</a> </a>
</div> </div>
<div class="row-fluid"> <div class="row">
<div class="span10 offset1"> <div class="col-md-10 col-md-offset-1">
<h1 class="title">Licenses</h1> <h1 class="title">Licenses</h1>
<h3 id="instructional-material">Instructional Material</h3> <h3 id="instructional-material">Instructional Material</h3>
...@@ -68,6 +65,6 @@ ...@@ -68,6 +65,6 @@
</div> </div>
<!-- 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/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> </body>
</html> </html>
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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.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.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"/> <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
......
<!-- 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/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>
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
$header$ $header$
</head> </head>
<body class="lesson"> <body class="lesson">
<div class="container container-full-width card"> <div class="container">
$banner$ $banner$
<div class="row-fluid"> <div class="row">
<div class="span10 offset1"> <div class="col-md-10 col-md-offset-1">
<h1 class="title">$title$</h1> <h1 class="title">$title$</h1>
$if(subtitle)$<h2 class="subtitle">$subtitle$</h2>$endif$ $if(subtitle)$<h2 class="subtitle">$subtitle$</h2>$endif$
$body$ $body$
......
...@@ -7,10 +7,7 @@ ...@@ -7,10 +7,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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.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.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"/> <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
...@@ -19,14 +16,14 @@ ...@@ -19,14 +16,14 @@
<![endif]--> <![endif]-->
</head> </head>
<body class="lesson"> <body class="lesson">
<div class="container container-full-width card"> <div class="container">
<div class="banner"> <div class="banner">
<a href="http://software-carpentry.org" title="Software Carpentry"> <a href="http://software-carpentry.org" title="Software Carpentry">
<img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />
</a> </a>
</div> </div>
<div class="row-fluid"> <div class="row">
<div class="span10 offset1"> <div class="col-md-10 col-md-offset-1">
<h1 class="title">Lesson Title</h1> <h1 class="title">Lesson Title</h1>
<h2 class="subtitle">Discussion</h2> <h2 class="subtitle">Discussion</h2>
<ul> <ul>
...@@ -45,6 +42,6 @@ ...@@ -45,6 +42,6 @@
</div> </div>
<!-- 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/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> </body>
</html> </html>
...@@ -7,10 +7,7 @@ ...@@ -7,10 +7,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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.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.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"/> <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
...@@ -19,14 +16,14 @@ ...@@ -19,14 +16,14 @@
<![endif]--> <![endif]-->
</head> </head>
<body class="lesson"> <body class="lesson">
<div class="container container-full-width card"> <div class="container">
<div class="banner"> <div class="banner">
<a href="http://software-carpentry.org" title="Software Carpentry"> <a href="http://software-carpentry.org" title="Software Carpentry">
<img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />
</a> </a>
</div> </div>
<div class="row-fluid"> <div class="row">
<div class="span10 offset1"> <div class="col-md-10 col-md-offset-1">
<h1 class="title">Lesson Title</h1> <h1 class="title">Lesson Title</h1>
<p>Paragraph of introductory material.</p> <p>Paragraph of introductory material.</p>
...@@ -57,6 +54,6 @@ ...@@ -57,6 +54,6 @@
</div> </div>
<!-- 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/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> </body>
</html> </html>
...@@ -7,10 +7,7 @@ ...@@ -7,10 +7,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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.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.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"/> <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
...@@ -19,14 +16,14 @@ ...@@ -19,14 +16,14 @@
<![endif]--> <![endif]-->
</head> </head>
<body class="lesson"> <body class="lesson">
<div class="container container-full-width card"> <div class="container">
<div class="banner"> <div class="banner">
<a href="http://software-carpentry.org" title="Software Carpentry"> <a href="http://software-carpentry.org" title="Software Carpentry">
<img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />
</a> </a>
</div> </div>
<div class="row-fluid"> <div class="row">
<div class="span10 offset1"> <div class="col-md-10 col-md-offset-1">
<h1 class="title">Lesson Title</h1> <h1 class="title">Lesson Title</h1>
<h2 class="subtitle">Instructor's Guide</h2> <h2 class="subtitle">Instructor's Guide</h2>
<h2 id="legend">Legend</h2> <h2 id="legend">Legend</h2>
...@@ -66,6 +63,6 @@ ...@@ -66,6 +63,6 @@
</div> </div>
<!-- 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/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> </body>
</html> </html>
...@@ -7,10 +7,7 @@ ...@@ -7,10 +7,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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.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.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"/> <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
...@@ -19,14 +16,14 @@ ...@@ -19,14 +16,14 @@
<![endif]--> <![endif]-->
</head> </head>
<body class="lesson"> <body class="lesson">
<div class="container container-full-width card"> <div class="container">
<div class="banner"> <div class="banner">
<a href="http://software-carpentry.org" title="Software Carpentry"> <a href="http://software-carpentry.org" title="Software Carpentry">
<img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />
</a> </a>
</div> </div>
<div class="row-fluid"> <div class="row">
<div class="span10 offset1"> <div class="col-md-10 col-md-offset-1">
<h1 class="title">Lesson Title</h1> <h1 class="title">Lesson Title</h1>
<h2 class="subtitle">Reference</h2> <h2 class="subtitle">Reference</h2>
<h2 id="topic-title-one"><a href="01-one.html">Topic Title One</a></h2> <h2 id="topic-title-one"><a href="01-one.html">Topic Title One</a></h2>
...@@ -36,10 +33,10 @@ ...@@ -36,10 +33,10 @@
<h2 id="glossary">Glossary</h2> <h2 id="glossary">Glossary</h2>
<dl> <dl>
<dt><span id="key-word-1">key word 1</span></dt> <dt><span id="key-word-1">key word 1</span></dt>
<dd>Definition of first term <dd><p>Definition of first term</p>
</dd> </dd>
<dt><span id="key-word-2">key word 2</span></dt> <dt><span id="key-word-2">key word 2</span></dt>
<dd>Definition of second term <dd><p>Definition of second term</p>
</dd> </dd>
</dl> </dl>
</div> </div>
...@@ -53,6 +50,6 @@ ...@@ -53,6 +50,6 @@
</div> </div>
<!-- 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/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> </body>
</html> </html>
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