Merge branch 'master' into develop

This commit is contained in:
leogermani 2019-05-23 14:34:15 -03:00
commit 5e5fba4480
3 changed files with 14 additions and 4 deletions

View File

@ -450,6 +450,8 @@
}
}
.s-item-collection--metadata{
height: 100%;
div {
-webkit-column-break-inside: avoid;
page-break-inside: avoid;

View File

@ -38,7 +38,15 @@
</p>
</div>
<div class="col-auto pr-0 pr-md-3 d-none d-md-block align-self-md-top">
<img src="<?php if ( get_theme_mod( 'tainacan_footer_logo' ) ) { echo esc_attr( get_theme_mod( 'tainacan_footer_logo' ) ); }else{ echo esc_url( get_template_directory_uri() ); ?>/assets/images/logo-footer.svg<?php }?> ?>" class="tainacan-footer-info--logo" >
<?php
if ( get_theme_mod( 'tainacan_footer_logo' ) ) {
$footerImage = esc_attr( get_theme_mod( 'tainacan_footer_logo' ) );
} else {
$footerImage = esc_url( get_template_directory_uri() ) . '/assets/images/logo-footer.svg';
}
?>
<img src="<?php echo $footerImage; ?>" class="tainacan-footer-info--logo" >
</div>
<div class="col-12 tainacan-powered">
<span>

View File

@ -105,15 +105,15 @@
<div class="single-item-collection--information justify-content-center">
<div class="row">
<div class="col s-item-collection--metadata">
<?php if ( has_post_thumbnail() ) : ?>
<div class="card border-0">
<?php if (has_post_thumbnail()): ?>
<div class="card border-0 mb-3">
<div class="card-body bg-white border-0 pl-0 pt-0 pb-1">
<h3><?php _e( 'Thumbnail', 'tainacan-interface' ); ?></h3>
<?php the_post_thumbnail('tainacan-medium-full', array('class' => 'item-card--thumbnail mt-2')); ?>
</div>
</div>
<?php endif; ?>
<div class="card border-0 my-3">
<div class="card border-0 mb-3">
<div class="card-body bg-white border-0 pl-0 pt-0 pb-1">
<h3><?php _e( 'Share', 'tainacan-interface' ); ?></h3>
<div class="btn-group" role="group">