Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/JetImpex/wapu into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
corvus committed Jun 6, 2017
2 parents 447b1f9 + 6cf8684 commit 80175b7
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions wapu-core/shortcodes/blurb/blurb-boxed-description.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*/
?>
<div class="blurb <?php echo $class; ?>" <?php echo $id; ?>>
<?php $this->html( $link, '<a href="%1$s" class="blurb__link">' ) ?>
<?php $this->html( $link, '<a href="%1$s" class="blurb__link"%2$s>', array( $target ) ); ?>
<?php echo $img_tag; ?>
<?php $this->html( $font_icon, '<i class="nc-icon-outline %s"></i>' ); ?>
</a>
<?php $this->html( $link, '</a>' ); ?>
<div class="blurb_description">
<?php
$this->html( $title, '<h6 class="blurb__title">%s</h6>' );
$this->html( $text, '<div class="blurb__text">%s</div>' );
<?php
$this->html( $title, '<h6 class="blurb__title">%s</h6>' );
$this->html( $text, '<div class="blurb__text">%s</div>' );
?>
</div>
</div>
10 changes: 5 additions & 5 deletions wapu-core/shortcodes/blurb/blurb-boxed.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*/
?>
<div class="blurb <?php echo $class; ?>" <?php echo $id; ?>>
<?php $this->html( $link, '<a href="%1$s" class="blurb__link">' ) ?>
<?php $this->html( $link, '<a href="%1$s" class="blurb__link"%2$s>', array( $target ) ); ?>
<?php echo $img_tag; ?>
<?php $this->html( $font_icon, '<i class="nc-icon-outline %s"></i>' ); ?>
<div class="blurb_description">
<?php
$this->html( $title, '<h6 class="blurb__title">%s</h6>' );
$this->html( $text, '<div class="blurb__text">%s</div>' );
<?php
$this->html( $title, '<h6 class="blurb__title">%s</h6>' );
$this->html( $text, '<div class="blurb__text">%s</div>' );
?>
</div>
</a>
<?php $this->html( $link, '</a>' ); ?>
</div>
10 changes: 5 additions & 5 deletions wapu-core/shortcodes/blurb/blurb-large.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*/
?>
<div class="blurb <?php echo $class; ?>" <?php echo $id; ?>>
<?php $this->html( $link, '<a href="%1$s" class="blurb__link">' ) ?>
<?php $this->html( $link, '<a href="%1$s" class="blurb__link"%2$s>', array( $target ) ); ?>
<?php echo $img_tag; ?>
<?php $this->html( $font_icon, '<i class="nc-icon-outline %s"></i>' ); ?>
<div class="blurb_description">
<?php
$this->html( $title, '<h5 class="blurb__title">%s</h5>' );
$this->html( $text, '<div class="blurb__text">%s</div>' );
<?php
$this->html( $title, '<h5 class="blurb__title">%s</h5>' );
$this->html( $text, '<div class="blurb__text">%s</div>' );
?>
</div>
</a>
<?php $this->html( $link, '</a>' ); ?>
</div>
4 changes: 2 additions & 2 deletions wapu-core/shortcodes/blurb/blurb-simple.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
*/
?>
<div class="blurb <?php echo $class; ?>" <?php echo $id; ?>>
<?php $this->html( $link, '<a href="%1$s" class="blurb__link-wrap">' ) ?>
<?php $this->html( $link, '<a href="%1$s" class="blurb__link-wrap"%2$s>', array( $target ) ); ?>
<?php echo $img_tag; ?>
<?php $this->html( $font_icon, '<i class="nc-icon-outline %s"></i>' ); ?>
<?php $this->html( $title, '<h6 class="blurb__title">%s</h6>' ); ?>
<?php $this->html( $text, '<div class="blurb__text">%s</div>' ); ?>
<?php $this->html( $text, '<span class="blurb__link">%2$s</span>', array( $link_text ) ); ?>
</a>
<?php $this->html( $link, '</a>' ); ?>
</div>

0 comments on commit 80175b7

Please sign in to comment.