Commit f73b05cc authored by Raniere Silva's avatar Raniere Silva
Browse files

Merge pull request #205 from gvwilson/gh-pages 

Updating style files
parents 966a0322 9734238a

01-one.html

+20 −7
Original line number Diff line number Diff line
@@ -7,6 +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-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" />
@@ -16,7 +17,7 @@ 
    <![endif]-->

  </head>

  <body class="lesson">

    <div class="container">

    <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" />
@@ -26,13 +27,17 @@ 
        <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">

<h2>Learning Objectives</h2>

<div id="learning-objectives" 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>

</div>

<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>
@@ -41,18 +46,26 @@ from 
program</code></pre>

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

<p>and possibly including:</p>

<div id="callout-box" class="callout">

<h2>Callout Box</h2>

<div id="callout-box" 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>

</div>

<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&#39;s title" /><p class="caption">this is the image's title</p>

</div>

<div id="challenge-title" class="challenge">

<h2>Challenge Title</h2>

<div id="challenge-title" 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>

</div>

        </div>

      </div>

      <div class="footer">

02-two.html

+20 −7
Original line number Diff line number Diff line
@@ -7,6 +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-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" />
@@ -16,7 +17,7 @@ 
    <![endif]-->

  </head>

  <body class="lesson">

    <div class="container">

    <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" />
@@ -26,13 +27,17 @@ 
        <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">

<h2>Learning Objectives</h2>

<div id="learning-objectives" 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>

</div>

<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>
@@ -41,14 +46,22 @@ from 
program</code></pre>

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

<p>and possibly including:</p>

<div id="callout-box" class="callout">

<h2>Callout Box</h2>

<div id="callout-box" 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>

<div id="challenge-title" class="challenge">

<h2>Challenge Title</h2>

</div>

<div id="challenge-title" 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>

</div>

        </div>

      </div>

      <div class="footer">

LICENSE.html

+6 −7
Original line number Diff line number Diff line
@@ -7,6 +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-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" />
@@ -16,7 +17,7 @@ 
    <![endif]-->

  </head>

  <body class="lesson">

    <div class="container">

    <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" />
@@ -26,7 +27,7 @@ 
        <div class="col-md-10 col-md-offset-1">

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

          

<h3 id="instructional-material">Instructional Material</h3>

<h2 id="instructional-material">Instructional Material</h2>

<p>All Software Carpentry instructional material is made available under the <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution license</a>. The following is a human-readable summary of (and not a substitute for) the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">full legal text of the CC BY 4.0 license</a>.</p>

<p>You are free:</p>

<ul>
@@ -45,15 +46,13 @@ 
<li>You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.</li>

<li>No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.</li>

</ul>

<h3 id="software">Software</h3>

<h2 id="software">Software</h2>

<p>Except where otherwise noted, the example programs and other software provided by Software Carpentry are made available under the <a href="http://opensource.org">OSI</a>-approved <a href="http://opensource.org/licenses/mit-license.html">MIT license</a>.</p>

<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>

<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>

<p>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>

<h3 id="other-material">Other Material</h3>

<p>Our <a href="CODE_OF_CONDUCT.html">code of conduct</a> is taken from <a href="https://github.com/Bantik/contributor_covenant/blob/master/LICENSE">this site</a>, and is made available under the same MIT License as our software.</p>

<h3 id="trademark">Trademark</h3>

<p>&quot;Software Carpentry&quot; and the Software Carpentry logo are registered trademarks of Software Carpentry, Ltd.</p>

<h2 id="trademark">Trademark</h2>

<p>&quot;Software Carpentry&quot; and the Software Carpentry logo are registered trademarks of <a href="http://numfocus.org/">NumFOCUS</a>.</p>

        </div>

      </div>

      <div class="footer">

_includes/header.html

+1 −0
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-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" />

_layouts/page.html

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    $header$

  </head>

  <body class="lesson">

    <div class="container">

    <div class="container card">

      $banner$

      <div class="row">

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