diff --git a/01-one.html b/01-one.html index 99da8c21681b54ace8b7ecdef76273c3b2e2ee26..7cd2b84cbfdaae39ca4196bebb50061148a00877 100644 --- a/01-one.html +++ b/01-one.html @@ -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> diff --git a/02-two.html b/02-two.html index 1e34f777ae002c0f874a8608fa614feef11e2e4c..03052d2c6b9bb2c532caa3fafee2b85f56da6ef1 100644 --- a/02-two.html +++ b/02-two.html @@ -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> diff --git a/LICENSE.html b/LICENSE.html index 65e250711798849aa670eac23a2b5f3a797e2e4a..44f920ba5b019b5214b584f18799b799f48137f5 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -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> diff --git a/_includes/header.html b/_includes/header.html index dea8b8d52b22a883c9e71b055cbbe118cb1f8e8e..c0891e68b6fc346cfd0ce30e269eb698629e7e5c 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,10 +1,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 --> diff --git a/_includes/javascript.html b/_includes/javascript.html index 780f26ba3f6d33b7958cd9963536929f827385d4..62eb98f8fad9918a603b1498ebafaa8ab5de8a7c 100644 --- a/_includes/javascript.html +++ b/_includes/javascript.html @@ -1,3 +1,3 @@ <!-- 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> diff --git a/_layouts/page.html b/_layouts/page.html index 3b9780d5966a28148b812c94798b38c0e6cdcceb..f5c3b01b95c967c9c06ed5cba318282bcb4ba204 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -7,10 +7,10 @@ $header$ </head> <body class="lesson"> - <div class="container container-full-width card"> + <div class="container"> $banner$ - <div class="row-fluid"> - <div class="span10 offset1"> + <div class="row"> + <div class="col-md-10 col-md-offset-1"> <h1 class="title">$title$</h1> $if(subtitle)$<h2 class="subtitle">$subtitle$</h2>$endif$ $body$ diff --git a/discussion.html b/discussion.html index 9833fc3930493434d176a26bbe9448ac22f91141..163993a610670aef522eda15b854a1e63bec075a 100644 --- a/discussion.html +++ b/discussion.html @@ -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">Discussion</h2> <ul> @@ -45,6 +42,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> diff --git a/index.html b/index.html index 6906bd457343788cb956ad6d6c1a8437ce76ad5f..eb078dce31598b7444e38a560a890b93449a7df4 100644 --- a/index.html +++ b/index.html @@ -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> <p>Paragraph of introductory material.</p> @@ -57,6 +54,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> diff --git a/instructors.html b/instructors.html index 3acde8f566431612a841f353d937423a8f0a6c49..94bc89cea0cf2fc315208e5c64b6b3729a508837 100644 --- a/instructors.html +++ b/instructors.html @@ -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">Instructor's Guide</h2> <h2 id="legend">Legend</h2> @@ -66,6 +63,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> diff --git a/reference.html b/reference.html index ace543ccc5576e1357cce83f13ce3efbefc0e438..c466874ccf6e06250929a2630b11ef1bdda1bb45 100644 --- a/reference.html +++ b/reference.html @@ -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">Reference</h2> <h2 id="topic-title-one"><a href="01-one.html">Topic Title One</a></h2> @@ -36,10 +33,10 @@ <h2 id="glossary">Glossary</h2> <dl> <dt><span id="key-word-1">key word 1</span></dt> -<dd>Definition of first term +<dd><p>Definition of first term</p> </dd> <dt><span id="key-word-2">key word 2</span></dt> -<dd>Definition of second term +<dd><p>Definition of second term</p> </dd> </dl> </div> @@ -53,6 +50,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>