Skip to content

Commit 0a321c7

Browse files
rgaiacsrgaiacs
committed
Merge styles 'v9.1.1'
2 parents 0fb7002 + bb2b611 commit 0a321c7

File tree

7 files changed

+46
-16
lines changed

7 files changed

+46
-16
lines changed

‎_includes/lesson_footer.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="row">
66
<div class="col-md-6" align="left">
77
<h4>
8-
Copyright &copy; 2016
8+
Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
99
{% if site.carpentry == "swc" %}
1010
<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
1111
{% elsif site.carpentry == "dc" %}
@@ -17,10 +17,18 @@ <h4>
1717
</div>
1818
<div class="col-md-6" align="right">
1919
<h4>
20-
<a href="{{ site.github.repository_url }}/">Source</a>
20+
{% if page.source %}
21+
{% if page.source == "Rmd" %}
22+
<a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Edit on GitHub</a>
23+
{% endif %}
24+
{% else %}
25+
<a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path}}">Edit on GitHub</a>
26+
{% endif %}
2127
/
2228
<a href="{{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md">Contributing</a>
2329
/
30+
<a href="{{ site.github.repository_url }}/">Source</a>
31+
/
2432
<a href="{{ site.github.repository_url }}/blob/gh-pages/CITATION">Cite</a>
2533
/
2634
<a href="{{ site.contact }}">Contact</a>

‎_includes/navbar.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
{% comment %} Show setup instructions, reference guide, and lesson episodes for lessons. {% endcomment %}
5252
{% if site.kind == "lesson" %}
5353
<li><a href="{{ page.root }}/setup/">Setup</a></li>
54-
<li><a href="{{ page.root }}/reference/">Reference</a></li>
5554
<li class="dropdown">
5655
<a href="{{ page.root }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Episodes <span class="caret"></span></a>
5756
<ul class="dropdown-menu">
@@ -67,6 +66,7 @@
6766
<li class="dropdown">
6867
<a href="{{ page.root }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Extras <span class="caret"></span></a>
6968
<ul class="dropdown-menu">
69+
<li><a href="{{ page.root }}/reference/">Reference</a></li>
7070
{% for extra in site.extras %}
7171
<li><a href="{{ page.root }}{{ extra.url }}">{{ extra.title }}</a></li>
7272
{% endfor %}
@@ -76,6 +76,13 @@
7676

7777
{% comment %} Always show license. {% endcomment %}
7878
<li><a href="{{ page.root }}/license/">License</a></li>
79+
{% if page.source %}
80+
{% if page.source == "Rmd" %}
81+
<li><a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Improve this page <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a></li>
82+
{% endif %}
83+
{% else %}
84+
<li><a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path}}">Improve this page <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a></li>
85+
{% endif %}
7986
</ul>
8087
<form class="navbar-form navbar-right" role="search" id="search" onsubmit="google_search(); return false;">
8188
<div class="form-group">

‎_includes/syllabus.html‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<div class="syllabus">
66
<h2 id="schedule">Schedule</h2>
77

8+
{% assign lesson_number = 0 %}
89
{% assign day = 0 %}
910
{% assign multiday = false %}
1011
{% for episode in site.episodes %}
@@ -14,8 +15,8 @@ <h2 id="schedule">Schedule</h2>
1415

1516
<table class="table table-striped">
1617
<tr>
17-
<td class="col-md-1"></td>
18-
<td class="col-md-1"></td>
18+
{% if multiday %}<td class="col-md-1"></td>{% endif %}
19+
<td class="{% if multiday %}col-md-1{% else %}col-md-2{% endif %}"></td>
1920
<td class="col-md-3"><a href="{{ page.root }}/setup">Setup</a></td>
2021
<td class="col-md-7">Dowload files used on the lesson.</td>
2122
</tr>
@@ -26,8 +27,8 @@ <h2 id="schedule">Schedule</h2>
2627
{% assign hours = current | divided_by: 60 %}
2728
{% assign minutes = current | modulo: 60 %}
2829
<tr>
29-
{% if multiday %}<td></td>{% endif %}
30-
<td class="col-md-1">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>
30+
{% if multiday %}<td class="col-md-1"></td>{% endif %}
31+
<td class="{% if multiday %}col-md-1{% else %}col-md-2{% endif %}">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>
3132
<td class="col-md-3">Finish</td>
3233
<td class="col-md-7"></td>
3334
</tr>
@@ -38,9 +39,10 @@ <h2 id="schedule">Schedule</h2>
3839
{% assign minutes = current | modulo: 60 %}
3940
<tr>
4041
{% if multiday %}<td class="col-md-1">{% if episode.start %}Day {{ day }}{% endif %}</td>{% endif %}
41-
<td class="col-md-1">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>
42+
<td class="{% if multiday %}col-md-1{% else %}col-md-2{% endif %}">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>
4243
<td class="col-md-3">
43-
<a href="{{ page.root }}{{ episode.url }}">{{ episode.title }}</a>
44+
{% assign lesson_number = lesson_number | plus: 1 %}
45+
{{ lesson_number }}. <a href="{{ page.root }}{{ episode.url }}">{{ episode.title }}</a>
4446
</td>
4547
<td class="col-md-7">
4648
{% if episode.break %}
@@ -62,8 +64,8 @@ <h2 id="schedule">Schedule</h2>
6264
{% assign hours = current | divided_by: 60 %}
6365
{% assign minutes = current | modulo: 60 %}
6466
<tr>
65-
{% if multiday %}<td></td>{% endif %}
66-
<td class="col-md-1">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>
67+
{% if multiday %}<td class="col-md-1"></td>{% endif %}
68+
<td class="{% if multiday %}col-md-1{% else %}col-md-2{% endif %}">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>
6769
<td class="col-md-3">Finish</td>
6870
<td class="col-md-7"></td>
6971
</tr>

‎assets/css/bootstrap.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/lesson.scss‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ $color-testimonial: #fc8dc1 !default;
3232
color: $color;
3333
border-left: solid 5px $color;
3434
margin-bottom: 0px;
35+
border-radius: 4px 0 0 4px;
3536
}
3637

3738
.error { @include cdSetup($color-error); }
@@ -45,6 +46,18 @@ $color-testimonial: #fc8dc1 !default;
4546
.r { @include cdSetup($color-source); }
4647
.sql { @include cdSetup($color-source); }
4748

49+
.error pre,
50+
.output pre,
51+
.source pre,
52+
.bash pre,
53+
.make pre,
54+
.matlab pre,
55+
.python pre,
56+
.r pre,
57+
.sql pre {
58+
border-radius: 0 4px 4px 0;
59+
}
60+
4861
//----------------------------------------
4962
// Specialized blockquote environments for learning objectives, callouts, etc.
5063
//----------------------------------------
@@ -100,9 +113,9 @@ $codeblock-padding: 5px !default;
100113
//----------------------------------------
101114

102115
code {
103-
padding: 0 0;
104-
color: inherit;
105-
background-color: inherit;
116+
padding: 2px 5px;
117+
color: #3d90d9;
118+
background-color: #e7e7e7;
106119
}
107120

108121
img {

‎assets/js/jquery.min.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/lesson_initialize.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@
158158
[dc-lessons]: http://datacarpentry.org/lessons/
159159
[dc-site]: http://datacarpentry.org/
160160
[discuss-list]: http://lists.software-carpentry.org/listinfo/discuss
161-
[example-site]: https://swcarpentry.github.io/lesson-example/
162161
[github]: http://github.com
163162
[github-flow]: https://guides.github.com/introduction/flow/
164163
[github-join]: https://github.com/join

0 commit comments

Comments
 (0)