Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use BaguetteBox in base theme #2791

Merged
merged 26 commits into from
May 25, 2017
Merged

Use BaguetteBox in base theme #2791

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a9cdcac
Added baguettebox assets
May 22, 2017
93f1119
Use baguettebox.js in the base theme
May 22, 2017
cac39a1
updated changelog
May 22, 2017
00ebb1a
no demo
May 22, 2017
cd14beb
Update base.tmpl
ralsina May 22, 2017
cd11464
Update base_helper.tmpl
ralsina May 22, 2017
3829daf
jinjify
May 22, 2017
98752db
Merge branch 'baguette' of https://github.com/getnikola/nikola into b…
May 22, 2017
2f528cf
jinjify
May 22, 2017
de40901
Merge branch 'master' into baguette
May 24, 2017
34437a4
missing assets
May 24, 2017
be73d82
Merge branch 'master' into baguette
May 24, 2017
c383e23
nah
May 24, 2017
a445c84
minor test fixes
May 25, 2017
403dfb6
gitignore ignores too much
May 25, 2017
e8a049d
more minor test fixes
May 25, 2017
98ced63
more minor test fixes
May 25, 2017
260980c
more minor test fixes
May 25, 2017
d12cff5
more minor test fixes
May 25, 2017
ebe659a
wtf
May 25, 2017
806b5a0
wtf
May 25, 2017
d87857f
wtf
May 25, 2017
78fe276
wtf
May 25, 2017
103a054
wtf
May 25, 2017
572480d
wtf
May 25, 2017
925e6be
final test fixes
May 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
jinjify
  • Loading branch information
Roberto Alsina committed May 22, 2017
commit 2f528cfe04d172db758a6105ace4b6edc58d3c70
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/base.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</div>
{{ base.late_load_js() }}
{% if use_cdn %}
<script src="//cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
<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 %}
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/base_helper.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ lang="{{ lang }}">
{% macro html_stylesheets() %}
{% if use_bundles %}
{% if use_cdn %}
<link href="//cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.css" rel="stylesheet" type="text/css">
<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">
Expand Down