From 269bfb59cb0f27a345d89d82095f9aa954358412 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Tue, 4 Dec 2018 09:47:35 -0600 Subject: [PATCH 01/84] links.md: lesson-specific links --- _includes/links.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_includes/links.md b/_includes/links.md index 94fc15f3..63cf6be9 100644 --- a/_includes/links.md +++ b/_includes/links.md @@ -19,7 +19,13 @@ [jekyll]: https://jekyllrb.com/ [jupyter]: https://jupyter.org/ [lc-lessons]: https://librarycarpentry.org/lessons/ +[lesson-aio]: {{ relative_root_path }}{% link aio.md %} +[lesson-coc]: {{ relative_root_path }}{% link CODE_OF_CONDUCT.md %} [lesson-example]: https://carpentries.github.io/lesson-example/ +[lesson-license]: {{ relative_root_path }}{% link LICENSE.md %} +[lesson-mainpage]: {{ relative_root_path }}{% link index.md %} +[lesson-reference]: {{ relative_root_path }}{% link reference.md %} +[lesson-setup]: {{ relative_page_root }}{% link setup.md %} [mit-license]: https://opensource.org/licenses/mit-license.html [morea]: https://morea-framework.github.io/ [numfocus]: https://numfocus.org/ From ee234199a72c40f7c2b1ce1e7e3e809a92d715aa Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Fri, 7 Dec 2018 16:54:49 -0600 Subject: [PATCH 02/84] .travis.yml: use Python 3.7 Signed-off-by: Maxim Belkin --- bin/boilerplate/.travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/boilerplate/.travis.yml b/bin/boilerplate/.travis.yml index d30f78a4..de304aca 100644 --- a/bin/boilerplate/.travis.yml +++ b/bin/boilerplate/.travis.yml @@ -1,6 +1,6 @@ # dist: trusty # Ubuntu 14.04 language: python -python: 3.6 +python: 3.7 branches: only: - gh-pages From 8b7eae1a432b77efe41d3f57bcfb84de3f4a8d93 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Fri, 7 Dec 2018 14:55:51 -0600 Subject: [PATCH 03/84] links.md: sync with downstream (lesson-example) --- _includes/links.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/links.md b/_includes/links.md index 94fc15f3..4e87b32a 100644 --- a/_includes/links.md +++ b/_includes/links.md @@ -18,6 +18,7 @@ [jekyll-windows]: http://jekyll-windows.juthilo.com/ [jekyll]: https://jekyllrb.com/ [jupyter]: https://jupyter.org/ +[kramdown]: https://kramdown.gettalong.org/ [lc-lessons]: https://librarycarpentry.org/lessons/ [lesson-example]: https://carpentries.github.io/lesson-example/ [mit-license]: https://opensource.org/licenses/mit-license.html @@ -36,5 +37,6 @@ [styles]: https://github.com/carpentries/styles/ [swc-lessons]: https://software-carpentry.org/lessons/ [swc-releases]: https://github.com/swcarpentry/swc-releases +[training]: https://carpentries.github.io/instructor-training/ [workshop-repo]: {{ site.workshop_repo }} [yaml]: http://yaml.org/ From cb4e1ddab6472c812eefb3231bf4deb614f0fd37 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Wed, 12 Dec 2018 02:14:08 -0600 Subject: [PATCH 04/84] lesson_check.py: require _config.yml too --- bin/lesson_check.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/lesson_check.py b/bin/lesson_check.py index 84c28f37..78d78b2d 100755 --- a/bin/lesson_check.py +++ b/bin/lesson_check.py @@ -35,6 +35,7 @@ '%/README.md': False, '%/_extras/discuss.md': True, '%/_extras/guide.md': True, + '%/_config.yml': True, '%/index.md': True, '%/reference.md': True, '%/setup.md': True, From e488057711624b339109f456228ac68df9a0771a Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Wed, 12 Dec 2018 02:13:23 -0600 Subject: [PATCH 05/84] knit_lessons.sh: require 2 inputs exactly --- bin/knit_lessons.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/knit_lessons.sh b/bin/knit_lessons.sh index 194f1242..141c136a 100755 --- a/bin/knit_lessons.sh +++ b/bin/knit_lessons.sh @@ -3,6 +3,6 @@ # Only try running R to translate files if there are some files present. # The Makefile passes in the names of files. -if [ $# -ne 0 ] ; then +if [ $# -eq 2 ] ; then Rscript -e "source('bin/generate_md_episodes.R')" "$@" fi From 9abaca8cc52eb2f39be0d4a290a637e1906aaebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Michonneau?= Date: Thu, 20 Dec 2018 13:12:29 -0500 Subject: [PATCH 06/84] update link for coc reporting --- _includes/links.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/links.md b/_includes/links.md index 2e4b67a8..7ab32a9f 100644 --- a/_includes/links.md +++ b/_includes/links.md @@ -1,7 +1,7 @@ [cc-by-human]: https://creativecommons.org/licenses/by/4.0/ [cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode [ci]: http://communityin.org/ -[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html#reporting-guidelines +[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html#incident-reporting-guidelines [coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html [concept-maps]: https://carpentries.github.io/instructor-training/05-memory/ [contrib-covenant]: https://contributor-covenant.org/ From 98c4617f468c3023f87e1e36358f8df1c149e257 Mon Sep 17 00:00:00 2001 From: Gerard Capes Date: Wed, 23 Jan 2019 14:38:42 +0000 Subject: [PATCH 07/84] Clarify wording of PR & issue templates I see lots of contributions where none of this placeholder text has been deleted, but also quite a lot where the first line has been deleted, but the 'ext below' hasn't (exactly in accordance with the current instructions). --- .github/ISSUE_TEMPLATE.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 9dafd7fb..05fb019f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,4 +1,4 @@ -Please delete the text below before submitting your contribution. +Please delete this line and the text below before submitting your contribution. --- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6cc9e527..f5a44c8c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ -Please delete the text below before submitting your contribution. +Please delete this line and the text below before submitting your contribution. --- From ab8decae6cfafc87040ffec0d387cc9e403756dc Mon Sep 17 00:00:00 2001 From: Alex Whan Date: Wed, 6 Feb 2019 16:26:04 +1100 Subject: [PATCH 08/84] lesson_check.py: remove _config.yml from the list of required files Pull Request: carpentries/styles#388 --- bin/lesson_check.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/lesson_check.py b/bin/lesson_check.py index 78d78b2d..84c28f37 100755 --- a/bin/lesson_check.py +++ b/bin/lesson_check.py @@ -35,7 +35,6 @@ '%/README.md': False, '%/_extras/discuss.md': True, '%/_extras/guide.md': True, - '%/_config.yml': True, '%/index.md': True, '%/reference.md': True, '%/setup.md': True, From b3e88ce20aa77f474e10fed622f07d114d3194a0 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Fri, 1 Mar 2019 13:03:05 -0600 Subject: [PATCH 09/84] Colorize all boxes Use the same colors but apply 12.5% opacity. Solution boxes use 30% opacity --- assets/css/lesson.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/assets/css/lesson.scss b/assets/css/lesson.scss index 6e9e81ea..e6627afb 100644 --- a/assets/css/lesson.scss +++ b/assets/css/lesson.scss @@ -129,6 +129,17 @@ $codeblock-padding: 5px !default; font-size: 18px; } +.challenge { background-color: #eec27520; } +.callout { background-color: #f4fd9c20; } +.challenge { background-color: #eec27520; } +.checklist { background-color: #dfd2a020; } +.discussion { background-color: #eec27520; } +.keypoints { background-color: #7ae78e20; } +.objectives { background-color: #daee8420; } +.prereq { background-color: #9cd6dc20; } +.solution { background-color: #ded4b94d; } +.testimonial { background-color: #fc8dc120; } + blockquote p { margin: 5px; } From 8bda280836c6cdf30d8b072124aa111d7a2bfe11 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Wed, 6 Mar 2019 13:56:33 -0600 Subject: [PATCH 10/84] Improve contrast of code elements --- assets/css/lesson.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/lesson.scss b/assets/css/lesson.scss index e6627afb..f13beb8c 100644 --- a/assets/css/lesson.scss +++ b/assets/css/lesson.scss @@ -151,7 +151,7 @@ blockquote p { code { white-space: nowrap; padding: 2px 5px; - color: #3d90d9; + color: #006cad; background-color: #e7e7e7; } From 514fb469241fff95afaa44afe2c0551964879d92 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Mon, 11 Mar 2019 14:17:31 -0500 Subject: [PATCH 11/84] Prefix code blocks with language names Also, improve contrast of comments Signed-off-by: Maxim Belkin --- assets/css/bootstrap.css | 5 ++-- assets/css/lesson.scss | 51 ++++++++++++++++++++++------------------ assets/css/syntax.css | 12 +++++----- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/assets/css/bootstrap.css b/assets/css/bootstrap.css index 6704f50c..688158a8 100644 --- a/assets/css/bootstrap.css +++ b/assets/css/bootstrap.css @@ -1562,15 +1562,14 @@ kbd kbd { pre { display: block; padding: 9.5px; - margin: 0 0 10px; + margin: 0; font-size: 13px; line-height: 1.42857143; color: inherit; /* #333; -- CHANGE -- */ word-break: break-all; word-wrap: break-word; background-color: #f5f5f5; - border: 1px solid #ccc; - border-radius: 4px; + border: none; } pre code { padding: 0; diff --git a/assets/css/lesson.scss b/assets/css/lesson.scss index f13beb8c..e0c34c99 100644 --- a/assets/css/lesson.scss +++ b/assets/css/lesson.scss @@ -30,8 +30,9 @@ $color-testimonial: #fc8dc1 !default; @mixin cdSetup($color) { color: $color; + border: solid 0.5px $color; border-left: solid 5px $color; - margin: 15px 0; + margin: 15px 5px 10px 0; border-radius: 4px 0 0 4px; } @@ -46,24 +47,32 @@ $color-testimonial: #fc8dc1 !default; .r, .language-r { @include cdSetup($color-source); } .sql, .language-sql { @include cdSetup($color-source); } -.error pre, -.output pre, -.source pre, -.bash pre, -.language-bash pre, -.make pre, -.language-make pre, -.matlab pre, -.language-matlab pre, -.python pre, -.language-python pre, -.r pre, -.language-r pre, -.sql pre , -.language-sql pre { - border-radius: 0 4px 4px 0; +.error::before, +.output::before, +.source::before, +.bash::before, .language-bash::before, +.make::before, .language-make::before, +.matlab::before, .language-matlab::before, +.python::before, .language-python::before, +.r::before, .language-r::before, +.sql::before, .language-sql::before { + background-color: #f2eff6; + display: block; + font-weight: bold; + padding: 5px 10px; } +.error::before { background-color: #ffebe6; content: "Error"; } +.output::before { background-color: #efefef; content: "Output"; } +.source::before { content: "Code"; } +.bash::before, .language-bash::before { content: "Bash"; } +.make::before, .language-make::before { content: "Make"; } +.matlab::before, .language-matlab::before { content: "Matlab"; } +.python::before, .language-python::before { content: "Python"; } +.r::before, .language-r::before { content: "R"; } +.sql::before, .language-sql::before { content: "SQL"; } + + //---------------------------------------- // Specialized blockquote environments for learning objectives, callouts, etc. //---------------------------------------- @@ -75,16 +84,12 @@ $codeblock-padding: 5px !default; $gradientcolor1: $color; $gradientcolor2: scale-color($color, $lightness: 10%); - padding-left: $codeblock-padding; - padding-top: 0; - padding-bottom: 0; - padding-right: 0; + padding: 0 0 $codeblock-padding $codeblock-padding; border: 1px solid; border-color: $color; border-radius: 4px; - padding-bottom: $codeblock-padding; - margin: 15px 0; + margin: 15px 5px 10px 0; h2 { padding-top: $codeblock-padding; diff --git a/assets/css/syntax.css b/assets/css/syntax.css index 572069c1..83a7e979 100644 --- a/assets/css/syntax.css +++ b/assets/css/syntax.css @@ -1,15 +1,15 @@ .highlight .hll { background-color: #ffffcc } .highlight { background: #f8f8f8; } -.highlight .c { color: #408080; font-style: italic } /* Comment */ +.highlight .c { color: #387d7d; font-style: italic } /* Comment */ .highlight .err { border: 1px solid #FF0000 } /* Error */ .highlight .k { color: #008000; font-weight: bold } /* Keyword */ .highlight .o { color: #666666 } /* Operator */ -.highlight .ch { color: #408080; font-style: italic } /* Comment.Hashbang */ -.highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */ +.highlight .ch { color: #387d7d; font-style: italic } /* Comment.Hashbang */ +.highlight .cm { color: #387d7d; font-style: italic } /* Comment.Multiline */ .highlight .cp { color: #BC7A00 } /* Comment.Preproc */ -.highlight .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ -.highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */ -.highlight .cs { color: #408080; font-style: italic } /* Comment.Special */ +.highlight .cpf { color: #387d7d; font-style: italic } /* Comment.PreprocFile */ +.highlight .c1 { color: #387d7d; font-style: italic } /* Comment.Single */ +.highlight .cs { color: #387d7d; font-style: italic } /* Comment.Special */ .highlight .gd { color: #A00000 } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #FF0000 } /* Generic.Error */ From cd761b2951134d4a5311d002b5999a3a3f255605 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Tue, 12 Mar 2019 12:30:44 -0500 Subject: [PATCH 12/84] Fix contrast of links in challenge blocks --- assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/bootstrap.css b/assets/css/bootstrap.css index 688158a8..58a33dde 100644 --- a/assets/css/bootstrap.css +++ b/assets/css/bootstrap.css @@ -1098,7 +1098,7 @@ textarea { line-height: inherit; } a { - color: #337ab7; + color: #2876b5; text-decoration: none; } a:hover, From 124dea1b44cab5e00ba3ca60e916b43a717e6e12 Mon Sep 17 00:00:00 2001 From: Ana Costa <29195893+anacost@users.noreply.github.com> Date: Wed, 20 Mar 2019 19:43:23 +0000 Subject: [PATCH 13/84] reference to the webpage of the lesson + goodfirst This contribution adds reference to the web page of the lesson in the Carpentries and makes it easier for visitors who want to contribute to get familiar with the good first issue badge. This adds a list of current maintainers to the README.md. --- bin/boilerplate/README.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/bin/boilerplate/README.md b/bin/boilerplate/README.md index 43a6b722..22a3f79a 100644 --- a/bin/boilerplate/README.md +++ b/bin/boilerplate/README.md @@ -2,7 +2,7 @@ [![Create a Slack Account with us](https://img.shields.io/badge/Create_Slack_Account-The_Carpentries-071159.svg)](https://swc-slack-invite.herokuapp.com/) -FIXME +This repository generates the corresponding lesson website from [The Carpentries](https://carpentries.org/) repertoire of lessons. ## Contributing @@ -13,9 +13,21 @@ We'd like to ask you to familiarize yourself with our [Contribution Guide](CONTR the [more detailed guidelines][lesson-example] on proper formatting, ways to render the lesson locally, and even how to write new episodes. +Please see the current list of [issues][] for ideas for contributing to this +repository. For making your contribution, we use the GitHub flow, which is +nicely explained in the chapter [Contributing to a Project](http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project) in Pro Git +by Scott Chacon. +Look for the tag ![good_first_issue](https://img.shields.io/badge/-good%20first%20issue-yellowgreen.svg). This indicates that the mantainers will welcome a pull request fixing this issue. + + ## Maintainer(s) -* FIXME +Current maintainers of this lesson are + +* +* +* + ## Authors From 5fc0f39109587631c41aae6ca10dfc42d2655b31 Mon Sep 17 00:00:00 2001 From: Ana Costa <29195893+anacost@users.noreply.github.com> Date: Thu, 21 Mar 2019 09:28:22 +0000 Subject: [PATCH 14/84] gold colour to badge gold looks more like the yellow from the original badge --- bin/boilerplate/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/boilerplate/README.md b/bin/boilerplate/README.md index 22a3f79a..2554ac8f 100644 --- a/bin/boilerplate/README.md +++ b/bin/boilerplate/README.md @@ -17,7 +17,7 @@ Please see the current list of [issues][] for ideas for contributing to this repository. For making your contribution, we use the GitHub flow, which is nicely explained in the chapter [Contributing to a Project](http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project) in Pro Git by Scott Chacon. -Look for the tag ![good_first_issue](https://img.shields.io/badge/-good%20first%20issue-yellowgreen.svg). This indicates that the mantainers will welcome a pull request fixing this issue. +Look for the tag ![good_first_issue](https://img.shields.io/badge/-good%20first%20issue-gold.svg). This indicates that the mantainers will welcome a pull request fixing this issue. ## Maintainer(s) From 962e3d9cd0ef8b4a7629880bc894f4940a1fe303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Michonneau?= Date: Thu, 21 Mar 2019 11:54:01 +0100 Subject: [PATCH 15/84] add 'FIXME' so they will be picked up by checks --- bin/boilerplate/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/boilerplate/README.md b/bin/boilerplate/README.md index 2554ac8f..ed47f43c 100644 --- a/bin/boilerplate/README.md +++ b/bin/boilerplate/README.md @@ -13,7 +13,7 @@ We'd like to ask you to familiarize yourself with our [Contribution Guide](CONTR the [more detailed guidelines][lesson-example] on proper formatting, ways to render the lesson locally, and even how to write new episodes. -Please see the current list of [issues][] for ideas for contributing to this +Please see the current list of [issues][FIXME] for ideas for contributing to this repository. For making your contribution, we use the GitHub flow, which is nicely explained in the chapter [Contributing to a Project](http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project) in Pro Git by Scott Chacon. @@ -24,9 +24,9 @@ Look for the tag ![good_first_issue](https://img.shields.io/badge/-good%20first% Current maintainers of this lesson are -* -* -* +* FIXME +* FIXME +* FIXME ## Authors From 853155cd12ad88c42b5a4d1f25b5a8b4054b644e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Michonneau?= Date: Wed, 27 Mar 2019 17:13:57 +0100 Subject: [PATCH 16/84] use xenial on travis --- bin/boilerplate/.travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/boilerplate/.travis.yml b/bin/boilerplate/.travis.yml index de304aca..4f23be8c 100644 --- a/bin/boilerplate/.travis.yml +++ b/bin/boilerplate/.travis.yml @@ -1,4 +1,4 @@ -# dist: trusty # Ubuntu 14.04 +dist: xenial # Ubuntu 16.04 (required for python 3.7) language: python python: 3.7 branches: From 51d615d0f9fc12535adf932b3abf1cb94bd757ec Mon Sep 17 00:00:00 2001 From: Katrin Leinweber <9948149+katrinleinweber@users.noreply.github.com> Date: Thu, 18 Apr 2019 16:41:19 +0200 Subject: [PATCH 17/84] bin/lesson_check.py: avoid inconsistent grammar Pull Request: carpentries/styles#396 --- bin/lesson_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/lesson_check.py b/bin/lesson_check.py index 84c28f37..b0b5581a 100755 --- a/bin/lesson_check.py +++ b/bin/lesson_check.py @@ -342,7 +342,7 @@ def check_line_lengths(self): n > MAX_LINE_LEN) and (not l.startswith('!'))] self.reporter.check(not over, self.filename, - 'Line(s) are too long: {0}', + 'Line(s) too long: {0}', ', '.join([str(i) for i in over])) def check_trailing_whitespace(self): From 19885f709c30028a447e4bc03aa3d0b5a3acccbb Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Thu, 18 Apr 2019 14:26:28 -0500 Subject: [PATCH 18/84] util.py: hot fix for YAML loader --- bin/util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/util.py b/bin/util.py index 522f5dfc..f9dc12f3 100644 --- a/bin/util.py +++ b/bin/util.py @@ -144,7 +144,7 @@ def split_metadata(path, text): metadata_raw = pieces[1] text = pieces[2] try: - metadata_yaml = yaml.load(metadata_raw) + metadata_yaml = yaml.load(metadata_raw, Loader=yaml.FullLoader) except yaml.YAMLError as e: print('Unable to parse YAML header in {0}:\n{1}'.format( path, e), file=sys.stderr) @@ -161,7 +161,7 @@ def load_yaml(filename): try: with open(filename, 'r') as reader: - return yaml.load(reader) + return yaml.load(reader, Loader=yaml.FullLoader) except (yaml.YAMLError, IOError) as e: print('Unable to load YAML file {0}:\n{1}'.format( filename, e), file=sys.stderr) From 29dc6c4785278ecbf7dd67988c83d58a49dd7b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Michonneau?= Date: Fri, 26 Apr 2019 14:51:30 -0400 Subject: [PATCH 19/84] add data-checker-ignore attributes to links that only work on GitHub --- _includes/lesson_footer.html | 4 ++-- _includes/navbar.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html index 621243df..9f669db1 100644 --- a/_includes/lesson_footer.html +++ b/_includes/lesson_footer.html @@ -36,11 +36,11 @@ Edit on GitHub {% endif %} / - Contributing + Contributing / Source / - Cite + Cite / Contact diff --git a/_includes/navbar.html b/_includes/navbar.html index 40939226..cc9b884a 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -77,10 +77,10 @@
  • License
  • {% if page.source %} {% if page.source == "Rmd" %} -
  • Improve this page
  • +
  • Improve this page
  • {% endif %} {% else %} -
  • Improve this page
  • +
  • Improve this page
  • {% endif %}