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

Get core and gh-pages sync 

This is based on 966a0322 from gh-pages.

Thanks to @ChristinaLK to report the problem.
parent af883468

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ clean : 
preview : $(DST_ALL)



# Pattern for slides (different parameters and template).

motivation.html : motivation.md _layouts/slides.html

	pandoc -s -t html \

motivation.html : motivation.md _layouts/slides.revealjs Makefile

	pandoc -s -t revealjs --slide-level 2 \

	--template=_layouts/slides \

	-o $@ $<

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

_layouts/page.html

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

_layouts/slides.revealjs

0 → 100644
+62 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html>

<head>

  <meta charset="utf-8">

  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">



$for(author-meta)$

  <meta name="author" content="$author-meta$">

$endfor$

$if(date-meta)$

  <meta name="date" content="$date-meta$">

$endif$

  <title>$if(title-prefix)$$title-prefix$ - $endif$$pagetitle$</title>



$for(css)$

  <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/>

$endfor$



  <script src="js/deckjs-custom.js"></script>

  <script>

      // TODO: finer filter on what is needed (vs profile-5)

      includedeck("css/swc-slides.css", {

         BEFOREINIT: function() {

            $$(".slide.auto li:not(li li):not(.notslide)").addClass("slide");

         }

      });

  </script>

</head>

<body>

  <div class="deck-container">



$if(omit-title)$

$else$

    <div class="slide title-slide" data-container-class="no-status">

        <h1 class="var-title"></h1>

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

    </div>

$endif$



    <!-- Begin slides. Just make elements with a class of slide. -->

$body$

    <!-- End slides. -->



    <!-- Begin extension snippets. Add or remove as needed. -->



    <!-- deck.navigation snippet -->

    <div aria-role="navigation">

      <a href="#" class="deck-prev-link" title="Previous">&#8592;</a>

      <a href="#" class="deck-next-link" title="Next">&#8594;</a>

    </div>



    <!-- footer -->

    <p class="deck-status deck-progress-10"> <span class="deck-status-current"></span> / <span class="deck-status-total"></span> − <span class="var-title">will be replaced by the title</span></p>

    <!-- progress bar -->

    <div class="progress-bar" data-progress-size=":spe.bottom(0, 1) ; left: slide.left+'px' ; height: designRatio+'px'" data-progress="width: detail.p * slide.width" style="position: absolute;"> </div>



    <!-- End extension snippets. -->

  </div>



</body>

</html>