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: 7b3f0c68669d
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 49dbf4e8f71f
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Jan 13, 2015

  1. Fix #1536

    @ralsina
    ralsina committed Jan 13, 2015
    Copy the full SHA
    2f04d41 View commit details

  2. Merge pull request #1579 from getnikola/fix-1536 

    Fix #1536
    @Kwpolska
    Kwpolska committed Jan 13, 2015
    Copy the full SHA
    49dbf4e View commit details
1 change: 1 addition & 0 deletions CHANGES.txt
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap-jinja/templates/base.tmpl
View file
Original file line number Diff line number Diff line change
@@ -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] }}");
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap/templates/base.tmpl
View file
Original file line number Diff line number Diff line change
@@ -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]}");
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
View file
Original file line number Diff line number Diff line change
@@ -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] }}");
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3/templates/base.tmpl
View file
Original file line number Diff line number Diff line change
@@ -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]}");