Unverified Commit 7d935a55 authored by François Michonneau's avatar François Michonneau Committed by GitHub
Browse files

Merge pull request #361 from carpentries/update-styles-2021-10-13-00-01

parents 2533e87e e3669725
Loading
Loading
Loading
Loading
+11 −9
Original line number Diff line number Diff line
@@ -21,13 +21,15 @@ license terms.

Under the following terms:

* **Attribution**---You must give appropriate credit (mentioning that
  your work is derived from work that is Copyright © Software
  Carpentry and, where practical, linking to
  http://software-carpentry.org/), provide a [link to the
  license][cc-by-human], and indicate if changes were made. You may do
  so in any reasonable manner, but not in any way that suggests the
  licensor endorses you or your use.
* **Attribution**---You must give appropriate credit by:
  - mentioning that your work is derived from work that is
    Copyright © Software Carpentry, Data Carpentry, Library Carpentry,
    or The Carpentries.
  - where practical, linking to the respective lesson program website
    (https://software-carpentry.org/, https://datacarpentry.org, https://librarycarpentry.org, or
    https://carpentries.org), provide a [link to the license][cc-by-human]
  - and indicate if changes were made. You may do so in any reasonable manner, but not in any way
    that suggests the licensor endorses you or your use.

**No additional restrictions**---You may not apply legal terms or
technological measures that legally restrict others from doing
@@ -71,8 +73,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

## Trademark

"Software Carpentry" and "Data Carpentry" and their respective logos
are registered trademarks of [Community Initiatives][CI].
"The Carpentries", "Software Carpentry" and "Data Carpentry" and their respective logos are
registered trademarks of [Community Initiatives][CI].

[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
+19 −6
Original line number Diff line number Diff line
@@ -5,14 +5,27 @@
<script src="{{ relative_root_path }}/assets/js/bootstrap.min.js"></script>
<script src="{{ relative_root_path }}/assets/js/lesson.js"></script>

{% if site.kind == "lesson" %}
<!-- Matomo -->
<script>
  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
  ga('create', 'UA-37305346-2', 'auto');
  ga('send', 'pageview');
  var _paq = window._paq = window._paq || [];
  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
  _paq.push(["setDomains", ["*.lessons.carpentries.org","*.datacarpentry.github.io","*.datacarpentry.org","*.librarycarpentry.github.io","*.swcarpentry.github.io"]]);
  _paq.push(["setDoNotTrack", true]);
  _paq.push(["disableCookies"]);
  _paq.push(['trackPageView']);
  _paq.push(['enableLinkTracking']);
  (function() {
    var u="https://carpentries.matomo.cloud/";
    _paq.push(['setTrackerUrl', u+'matomo.php']);
    _paq.push(['setSiteId', '1']);
    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
    g.async=true; g.src='//cdn.matomo.cloud/carpentries.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
  })();
</script>
<!-- End Matomo Code -->
{% endif %}

{% if page.math %}
<script src="{{ relative_root_path }}/assets/js/katex.min.js"></script>
+10 −0
Original line number Diff line number Diff line
@@ -389,3 +389,13 @@ kbd {
    white-space: nowrap;
    font-style: normal;
}

//------------------------------------------
// Show solution while printing (Ctrl + P)
// -----------------------------------------

@media print {
  blockquote.solution > * {
    display: unset !important;
  }
}