fix conflict

This commit is contained in:
Fabiano 2018-05-30 17:08:22 -03:00
commit 4309dcee1d
5 changed files with 119 additions and 8 deletions

View File

@ -0,0 +1,67 @@
.tainacan-frame-container {
padding: 30px 4.166666667%;
background-color: #f5f5f5;
.row {
justify-content: space-between;
align-items: center;
}
.col { flex-grow: 0; }
.tainacan-frame {
padding: 12px 12px 16px 12px;
text-align: center;
.frame {
background: black;
box-shadow: 0 10px 10px -6px rgba(0, 0, 0, 0.4);
padding: 12px;
}
.mat {
background: white;
padding: 20px;
box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.5) inset;
}
.art {
position: relative;
}
.art::before {
box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.5) inset;
content: "";
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
border-radius: 2px;
}
.art img {
width: 100%;
width: 258px;
height: auto;
border-radius: 2px;
}
.metadata-title {
flex-shrink: 0;
font-size: 0.875rem;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
padding: 0.5rem 0.75rem;
text-align: center;
display: inline-block;
background: #fff;
margin: 14px 8px 8px 8px;
box-shadow: 0px 1px 3px #ddd;
border: 1px solid #dedede;
}
}
}

View File

@ -206,4 +206,6 @@ form{
@import "_view-mode-mosaic.scss";
@import "_view-mode-frame.scss";
@import "_view-mode-masonry.scss";

View File

@ -72,6 +72,12 @@ if(!function_exists('tainacan_setup')) {
'icon' => '<span class="icon"><i class="mdi mdi-view-quilt mdi-24px"></i></span>',
'dynamic_metadata' => false,
]);
tainacan_register_view_mode('frame', [
'label' => 'Frame view',
'description' => 'A frame view, made for gallery expositions',
'icon' => '<span class="icon"><i class="mdi mdi-checkbox-intermediate mdi-24px"></i></span>',
'dynamic_metadata' => false,
]);
tainacan_register_view_mode('masonry', [
'label' => 'Masonry view',
'description' => 'A masonry view',

View File

@ -7,17 +7,24 @@
<div class="col col-md-12 col-lg-6 col-xl-4">
<div class="tainacan-card">
<p class="metadata-title"><?php the_title(); ?></p>
<?php if ( tainacan_current_view_displays('title') ): ?>
<p class="metadata-title">
<a href="<?php the_permalink(); ?>">
<?php the_title(); ?>
</a>
</p>
<?php endif; ?>
<div class="media">
<?php if ( tainacan_current_view_displays('thumbnail') ): ?>
<a href="<?php the_permalink(); ?>">
<?php the_post_thumbnail('thumbnail', array('class' => 'mr-4')); ?>
</a>
<?php endif; ?>
<div class="list-metadata media-body">
<?php foreach ($displayed_metadata as $meta_id): ?>
<?php tainacan_the_metadata($meta_id, array('before_title' => '<h3 class="metadata-label">', 'before_value' => '<p class="metadata-value">')); ?>
<?php endforeach; ?>
<?php tainacan_the_metadata(array('metadata__in' => $displayed_metadata, 'exclude_title' => true, 'before_title' => '<h3 class="metadata-label">', 'before_value' => '<p class="metadata-value">')); ?>
</div>
</div>
</div>

View File

@ -0,0 +1,29 @@
<?php if (have_posts()): ?>
<div class="tainacan-frame-container">
<div class="row no-gutters">
<?php while (have_posts()): the_post(); ?>
<div class="col">
<div class="tainacan-frame">
<div class="frame">
<div class="mat">
<div class="art">
<?php the_post_thumbnail('medium'); ?>
</div>
</div>
</div>
<p class="metadata-title"><?php the_title(); ?></p>
</div>
</div>
<?php endwhile; ?>
</div>
</div>
<?php else: ?>
<div class="tainacan-cards-container">
Nenhum item encontrado
</div>
<?php endif; ?>