Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cd1146479b46
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f528cfe04d1
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on May 22, 2017

  1. jinjify

    Roberto Alsina committed May 22, 2017
    Copy the full SHA
    3829daf View commit details

  2. Merge branch 'baguette' of https://github.com/getnikola/nikola into b… 

    …aguette
    Roberto Alsina committed May 22, 2017
    Copy the full SHA
    98752db View commit details

  3. jinjify

    Roberto Alsina committed May 22, 2017
    Copy the full SHA
    2f528cf View commit details
6 changes: 6 additions & 0 deletions nikola/data/themes/base-jinja/templates/base.tmpl
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,13 @@
{{ footer.html_footer() }}
</div>
{{ base.late_load_js() }}
{% if use_cdn %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
{% else %}
<script src="/assets/js/baguetteBox.min.js"></script>
{% endif %}
{% block extra_js %}{% endblock %}
<script>baguetteBox.run('a.reference');</script>
{{ body_end }}
{{ template_hooks['body_end']() }}
</body>
2 changes: 2 additions & 0 deletions nikola/data/themes/base-jinja/templates/base_helper.tmpl
View file
Original file line number Diff line number Diff line change
@@ -75,11 +75,13 @@ lang="{{ lang }}">
{% macro html_stylesheets() %}
{% if use_bundles %}
{% if use_cdn %}
<link href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
{% else %}
<link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
{% endif %}
{% else %}
<link href="/assets/css/baguetteBox.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
<link href="/assets/css/code.css" rel="stylesheet" type="text/css">
<link href="/assets/css/theme.css" rel="stylesheet" type="text/css">
1 change: 1 addition & 0 deletions nikola/data/themes/base-jinja/templates/gallery.tmpl
View file
Original file line number Diff line number Diff line change
@@ -96,6 +96,7 @@ flowr(document.querySelectorAll("#gallery_container")[0], {
}
}
});
baguetteBox.run('#gallery_container');
</script>
{% endblock %}