Skip to content

Commit 555226b

Browse files
fmichonneaufmichonneau
authored
Merge pull request #12 from carpentries/update-styles-v9.5.2
Update to styles v9.5.2
2 parents 569f761 + 711dc0b commit 555226b

File tree

120 files changed

+1067
-642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1067
-642
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@
55
.sass-cache
66
__pycache__
77
_site
8+
.Rproj.user
9+
.Rhistory
10+
.RData
11+

‎CODE_OF_CONDUCT.md

Lines changed: 11 additions & 0 deletions

‎LICENSE.md

Lines changed: 2 additions & 2 deletions

‎Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Settings
55
MAKEFILES=Makefile $(wildcard *.mk)
66
JEKYLL=jekyll
7+
JEKYLL_VERSION=3.7.3
78
PARSER=bin/markdown_ast.rb
89
DST=_site
910

@@ -16,6 +17,10 @@ all : commands
1617
commands :
1718
@grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'
1819

20+
## docker-serve : use docker to build the site
21+
docker-serve :
22+
docker run --rm -it -v ${PWD}:/srv/jekyll -p 127.0.0.1:4000:4000 jekyll/jekyll:${JEKYLL_VERSION} make serve
23+
1924
## serve : run a local server.
2025
serve : lesson-md
2126
${JEKYLL} serve
@@ -63,7 +68,7 @@ RMD_DST = $(patsubst _episodes_rmd/%.Rmd,_episodes/%.md,$(RMD_SRC))
6368
# Lesson source files in the order they appear in the navigation menu.
6469
MARKDOWN_SRC = \
6570
index.md \
66-
CONDUCT.md \
71+
CODE_OF_CONDUCT.md \
6772
setup.md \
6873
$(sort $(wildcard _episodes/*.md)) \
6974
reference.md \
@@ -88,16 +93,16 @@ ${RMD_DST} : ${RMD_SRC}
8893
@bin/knit_lessons.sh ${RMD_SRC}
8994

9095
## lesson-check : validate lesson Markdown.
91-
lesson-check :
96+
lesson-check : lesson-fixme
9297
@bin/lesson_check.py -s . -p ${PARSER} -r _includes/links.md
9398

9499
## lesson-check-all : validate lesson Markdown, checking line lengths and trailing whitespace.
95100
lesson-check-all :
96-
@bin/lesson_check.py -s . -p ${PARSER} -l -w
101+
@bin/lesson_check.py -s . -p ${PARSER} -r _includes/links.md -l -w --permissive
97102

98103
## unittest : run unit tests on checking tools.
99104
unittest :
100-
python bin/test_lesson_check.py
105+
@bin/test_lesson_check.py
101106

102107
## lesson-files : show expected names of generated files for debugging.
103108
lesson-files :

‎_includes/favicons.html

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{% assign favicon_url = site.baseurl | append: '/assets/favicons/' | append: site.carpentry | prepend: site.url %}
2+
3+
{% if site.carpentry == 'swc' %}
4+
{% assign carpentry = 'Software Carpentry' %}
5+
{% elsif site.carpentry == 'dc' %}
6+
{% assign carpentry = 'Data Carpentry' %}
7+
{% elsif site.carpentry == 'lc' %}
8+
{% assign carpentry = 'Library Carpentry' %}
9+
{% elsif site.carpentry == 'cp' %}
10+
{% assign carpentry = 'The Carpentries' %}
11+
{% endif %}
12+
13+
<!-- Favicons for everyone -->
14+
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="{{ favicon_url }}/apple-touch-icon-57x57.png" />
15+
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ favicon_url }}/apple-touch-icon-114x114.png" />
16+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ favicon_url }}/apple-touch-icon-72x72.png" />
17+
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ favicon_url }}/apple-touch-icon-144x144.png" />
18+
<link rel="apple-touch-icon-precomposed" sizes="60x60" href="{{ favicon_url }}/apple-touch-icon-60x60.png" />
19+
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="{{ favicon_url }}/apple-touch-icon-120x120.png" />
20+
<link rel="apple-touch-icon-precomposed" sizes="76x76" href="{{ favicon_url }}/apple-touch-icon-76x76.png" />
21+
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ favicon_url }}/apple-touch-icon-152x152.png" />
22+
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-196x196.png" sizes="196x196" />
23+
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-96x96.png" sizes="96x96" />
24+
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-32x32.png" sizes="32x32" />
25+
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-16x16.png" sizes="16x16" />
26+
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-128.png" sizes="128x128" />
27+
<meta name="application-name" content="{{ carpentry }} - {{ site.title }}"/>
28+
<meta name="msapplication-TileColor" content="#FFFFFF" />
29+
<meta name="msapplication-TileImage" content="{{ favicon_url }}/mstile-144x144.png" />
30+
<meta name="msapplication-square70x70logo" content="{{ favicon_url }}/mstile-70x70.png" />
31+
<meta name="msapplication-square150x150logo" content="{{ favicon_url }}/mstile-150x150.png" />
32+
<meta name="msapplication-wide310x150logo" content="{{ favicon_url }}/mstile-310x150.png" />
33+
<meta name="msapplication-square310x310logo" content="{{ favicon_url }}/mstile-310x310.png" />

‎_includes/lc/intro.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
</ul>
1111
<p align = "center">
1212
<em>
13-
    Library Carpentry te presenta los fundamentos de la informática y le proporciona una plataforma para un mayor aprendizaje autodirigido. Para obtener más información sobre lo que enseñamos y por qué consulte nuestro documento
14-
     "<a href="http://doi.org/10.18352/lq.10176"> Library Carpentry: software skills training for library professionals</a>".
13+
Library Carpentry te presenta los fundamentos de la informática y le proporciona una plataforma para un mayor aprendizaje autodirigido. Para obtener más información sobre lo que enseñamos y por qué consulte nuestro documento "<a href="http://doi.org/10.18352/lq.10176"> Library Carpentry: software skills training for library professionals</a>".
1514
</em>
16-
</p>
15+
</p>

‎_includes/lesson_footer.html

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,28 @@
33
{% endcomment %}
44
<footer>
55
<div class="row">
6-
<div class="col-md-6" align="left">
7-
<h4>
8-
Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
6+
<div class="col-md-6 copyright" align="left">
97
{% if site.carpentry == "swc" %}
8+
Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
9+
<a href="{{ site.carpentries_site }}">The Carpentries</a>
10+
<br>
11+
Copyright &copy; 2016–2018
1012
<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
1113
{% elsif site.carpentry == "dc" %}
14+
Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
15+
<a href="{{ site.carpentries_site }}">The Carpentries</a>
16+
<br>
17+
Copyright &copy; 2016–2018
1218
<a href="{{ site.dc_site }}">Data Carpentry</a>
1319
{% elsif site.carpentry == "lc" %}
20+
Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
1421
<a href="{{ site.lc_site }}">Library Carpentry</a>
22+
{% elsif site.carpentry == "cp" %}
23+
Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
24+
<a href="{{ site.carpentries_site }}">The Carpentries</a>
1525
{% endif %}
16-
</h4>
1726
</div>
18-
<div class="col-md-6" align="right">
19-
<h4>
27+
<div class="col-md-6 help-links" align="right">
2028
{% if page.source %}
2129
{% if page.source == "Rmd" %}
2230
<a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Editar en GitHub</a>
@@ -31,9 +39,13 @@ <h4>
3139
/
3240
<a href="{{ site.github.repository_url }}/blob/gh-pages/CITATION">Cita</a>
3341
/
34-
3542
<a href="mailto:{{ site.email }}">Contacto</a>
36-
</h4>
43+
</div>
44+
</div>
45+
<div class="row">
46+
<div class="col-md-12" align="center">
47+
<a href="https://github.com/carpentries/styles/">The Carpentries style</a>
48+
version <a href="https://github.com/carpentries/styles/releases/tag/v9.5.2">9.5.2</a>.
3749
</div>
3850
</div>
3951
</footer>

‎_includes/links.md

Lines changed: 11 additions & 10 deletions

‎_includes/navbar.html

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,23 @@
1111
<span class="icon-bar"></span>
1212
</button>
1313

14+
1415
{% comment %} Seleccione qué logotipo mostrar. {% endcomment %}
1516
{% if page.carpentry == "swc" %}
1617
<a href="{{ site.swc_site }}" class="pull-left">
1718
<img class="navbar-logo" src="{{ page.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" />
1819
</a>
19-
{% elsif page.carpentry == "dc" %}
20+
{% elsif site.carpentry == "dc" %}
2021
<a href="{{ site.dc_site }}" class="pull-left">
2122
<img class="navbar-logo" src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />
2223
</a>
23-
{% elsif page.carpentry == "lc" %}
24+
{% elsif site.carpentry == "lc" %}
2425
<a href="{{ site.lc_site }}" class="pull-left">
25-
<img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.png" alt="Library Carpentry logo" />
26+
<img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" />
27+
</a>
28+
{% elsif site.carpentry == "cp" %}
29+
<a href="{{ site.carpentries_site }}" class="pull-left">
30+
<img class="navbar-logo" src="{{ page.root }}/assets/img/cp-logo-blue.svg" alt="The Carpentries logo" />
2631
</a>
2732
{% endif %}
2833

@@ -34,7 +39,7 @@
3439
<ul class="nav navbar-nav">
3540

3641
{% comment %} Mostrar siempre el código de conducta. {% endcomment %}
37-
<li><a href="{{ page.root }}{% link CONDUCT.md %}">Código de conducta</a></li>
42+
<li><a href="{{ page.root }}{% link CODE_OF_CONDUCT.md %}">Code of Conduct</a></li>
3843

3944
{% if site.kind == "lesson" %}
4045
{% comment %} Muestra las instrucciones de configuración. {% endcomment %}

‎_includes/workshop_footer.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
<h4>
88
Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
99
{% if site.carpentry == "swc" %}
10-
<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
10+
<a href="{{ site.swc_site }}">Software Carpentry</a>
1111
{% elsif site.carpentry == "dc" %}
1212
<a href="{{ site.dc_site }}">Data Carpentry</a>
1313
{% elsif site.carpentry == "lc" %}
1414
<a href="{{ site.lc_site }}">Library Carpentry</a>
15+
{% elsif site.carpentry == "cp" %}
16+
<a href="{{ site.carpentries_site }}">The Carpentries</a>
1517
{% endif %}
1618
</h4>
1719
</div>

0 commit comments

Comments
 (0)