Merge branch 'release/3.2.2'

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Michael Rose 2016-06-01 21:32:55 -04:00
commit 5bc7f00f91
2 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,9 @@
## [3.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.2)
### Enhancement
- Add support for image captions in Magnific Popup overlays via the [`gallery` helper](https://github.com/mmistakes/minimal-mistakes/issues/334)
## [3.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.1)
### Bug Fixes

View file

@ -25,6 +25,7 @@
{% else %}
"{{ img.url | prepend: "/images/" | prepend: base_path }}"
{% endif %}
{% if img.title %}title="{{ img.title }}"{% endif %}
>
<img src=
{% if img.image_path contains "http" %}
@ -32,7 +33,7 @@
{% else %}
"{{ img.image_path | prepend: "/images/" | prepend: base_path }}"
{% endif %}
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
</a>
{% else %}
<img src=
@ -41,7 +42,7 @@
{% else %}
"{{ img.image_path | prepend: "/images/" | prepend: base_path }}"
{% endif %}
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
{% endif %}
{% endfor %}
{% if include.caption %}