Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Commit e22aa93

Browse files
author
Raniere Silva
committed
Get core and gh-pages sync
This is based on 966a0322695852676884f8c094b83d31cc4c728c from gh-pages. Thanks to @ChristinaLK to report the problem.
1 parent af88346 commit e22aa93

27 files changed

+19792
-9475
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ clean :
4242
preview : $(DST_ALL)
4343

4444
# Pattern for slides (different parameters and template).
45-
motivation.html : motivation.md _layouts/slides.html
46-
pandoc -s -t html \
45+
motivation.html : motivation.md _layouts/slides.revealjs Makefile
46+
pandoc -s -t revealjs --slide-level 2 \
4747
--template=_layouts/slides \
4848
-o $@ $<
4949

‎_includes/header.html

-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
22
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
33
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.css" />
4-
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-responsive.css" />
54
<link rel="stylesheet" type="text/css" href="css/swc.css" />
6-
<link rel="stylesheet" type="text/css" href="css/swc-workshop-and-lesson.css" />
7-
<link rel="stylesheet" type="text/css" href="css/lesson.css" />
85
<link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
96
<meta charset="UTF-8" />
107
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->

‎_includes/javascript.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<!-- Javascript placed at the end of the document so the pages load faster -->
22
<script src="http://software-carpentry.org/v5/js/jquery-1.9.1.min.js"></script>
3-
<script src="http://software-carpentry.org/v5/js/bootstrap/bootstrap.min.js"></script>
3+
<script src="css/bootstrap/bootstrap-js/bootstrap.js"></script>

‎_layouts/page.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
$header$
88
</head>
99
<body class="lesson">
10-
<div class="container container-full-width card">
10+
<div class="container">
1111
$banner$
12-
<div class="row-fluid">
13-
<div class="span10 offset1">
12+
<div class="row">
13+
<div class="col-md-10 col-md-offset-1">
1414
<h1 class="title">$title$</h1>
1515
$if(subtitle)$<h2 class="subtitle">$subtitle$</h2>$endif$
1616
$body$

‎_layouts/slides.revealjs

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
7+
8+
$for(author-meta)$
9+
<meta name="author" content="$author-meta$">
10+
$endfor$
11+
$if(date-meta)$
12+
<meta name="date" content="$date-meta$">
13+
$endif$
14+
<title>$if(title-prefix)$$title-prefix$ - $endif$$pagetitle$</title>
15+
16+
$for(css)$
17+
<link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/>
18+
$endfor$
19+
20+
<script src="js/deckjs-custom.js"></script>
21+
<script>
22+
// TODO: finer filter on what is needed (vs profile-5)
23+
includedeck("css/swc-slides.css", {
24+
BEFOREINIT: function() {
25+
$$(".slide.auto li:not(li li):not(.notslide)").addClass("slide");
26+
}
27+
});
28+
</script>
29+
</head>
30+
<body>
31+
<div class="deck-container">
32+
33+
$if(omit-title)$
34+
$else$
35+
<div class="slide title-slide" data-container-class="no-status">
36+
<h1 class="var-title"></h1>
37+
<img class="logo" src="img/software-carpentry-banner.png" alt="Software Carpentry"/>
38+
</div>
39+
$endif$
40+
41+
<!-- Begin slides. Just make elements with a class of slide. -->
42+
$body$
43+
<!-- End slides. -->
44+
45+
<!-- Begin extension snippets. Add or remove as needed. -->
46+
47+
<!-- deck.navigation snippet -->
48+
<div aria-role="navigation">
49+
<a href="#" class="deck-prev-link" title="Previous">&#8592;</a>
50+
<a href="#" class="deck-next-link" title="Next">&#8594;</a>
51+
</div>
52+
53+
<!-- footer -->
54+
<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>
55+
<!-- progress bar -->
56+
<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>
57+
58+
<!-- End extension snippets. -->
59+
</div>
60+
61+
</body>
62+
</html>

‎css/book.css

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
span.subtitle {
2+
color: #030303;
3+
display: block;
4+
font-family: inherit;
5+
font-size: 31.5px;
6+
font-weight: bold;
7+
line-height: 40px;
8+
margin: 40px 0px 10px 0px;
9+
text-rendering: optimizelegibility;
10+
}

0 commit comments

Comments
 (0)