Skip to content

Commit

Permalink
Merge branch 'release/0.2.18'
Browse files Browse the repository at this point in the history
  • Loading branch information
acketon committed Feb 20, 2020
2 parents 6a2ebf3 + 16e1bbc commit 46ddc88
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 0.2.18
- Leadin Block: fix image caption position for text-over-image style. This moves the caption up below the photo on small device sizes instead of the caption displaying below the hed/dek of the leadin block.

## 0.2.17
- Add new End of Article paragraph styles. Refactor to manual paragraph style fixes this issue in r-editorial: https://github.com/bu-ist/r-editorial/issues/876
- Intro Paragraph Block Bugs:
Expand Down
4 changes: 2 additions & 2 deletions src/blocks/leadin/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function render_block( $attributes ) {
<?php endif; ?>
</div>

<?php if ( $attributes['caption'] && ( $style_default || $style_image_to_text || $style_side_by_side ) ) : ?>
<?php if ( $attributes['caption'] && ( $style_default || $style_image_to_text || $style_side_by_side || $style_text_over_image ) ) : ?>
<p class="wp-block-editorial-leadin-caption wp-prepress-component-caption"><?php echo wp_kses_post( $attributes['caption'] ); ?></p>
<?php endif; ?>

Expand Down Expand Up @@ -154,7 +154,7 @@ function render_block( $attributes ) {

</div>

<?php if ( $attributes['caption'] && $style_text_to_image || $style_text_over_image ) : ?>
<?php if ( $attributes['caption'] && $style_text_to_image ) : ?>
<p class="wp-block-editorial-leadin-caption wp-prepress-component-caption"><?php echo wp_kses_post( $attributes['caption'] ); ?></p>
<?php endif; ?>

Expand Down

0 comments on commit 46ddc88

Please sign in to comment.