Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1579 from getnikola/fix-1536
Fix #1536
  • Loading branch information
Kwpolska committed Jan 13, 2015
2 parents 7b3f0c6 + 2f04d41 commit 49dbf4e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Expand Up @@ -63,6 +63,7 @@ Features
Bugfixes
--------

* Don't apply colorbox to figures if they are of islink class. (Issue #1536)
* Turned minify_lines into a no-op (Issue #1497)
* Don’t classify unpublished posts as pages (Issue #1577)
* Fixed a ``TranslatableSetting.langformat`` race condition
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap-jinja/templates/base.tmpl
Expand Up @@ -74,7 +74,7 @@
{{ template_hooks['page_footer']() }}
</div>
{{ base.late_load_js() }}
<script>jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
<script>jQuery("a.image-reference,!.islink").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
<!-- fancy dates -->
<script>
moment.locale("{{ momentjs_locales[lang] }}");
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap/templates/base.tmpl
Expand Up @@ -74,7 +74,7 @@ ${template_hooks['extra_head']()}
${template_hooks['page_footer']()}
</div>
${base.late_load_js()}
<script>jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
<script>jQuery("a.image-reference,!.islink").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
<!-- fancy dates -->
<script>
moment.locale("${momentjs_locales[lang]}");
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
Expand Up @@ -75,7 +75,7 @@
</div>

{{ base.late_load_js() }}
<script>jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
<script>jQuery("a.image-reference,!.islink").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
<!-- fancy dates -->
<script>
moment.locale("{{ momentjs_locales[lang] }}");
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3/templates/base.tmpl
Expand Up @@ -75,7 +75,7 @@ ${template_hooks['extra_head']()}
</div>

${base.late_load_js()}
<script>jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
<script>jQuery("a.image-reference,!.islink").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
<!-- fancy dates -->
<script>
moment.locale("${momentjs_locales[lang]}");
Expand Down

0 comments on commit 49dbf4e

Please sign in to comment.