Merge branch 'release/1.5'

This commit is contained in:
leogermani 2019-11-06 18:09:20 -03:00
commit 9e7c9240a0
19 changed files with 212 additions and 121 deletions

View File

@ -28,10 +28,11 @@ rm -rf $destination/vendor
##Slick
mkdir $destination/assets/vendor/slick/css
cp $destination/assets/vendor/slick/scss/slick.min.css $destination/assets/vendor/slick/css/slick.min.css
cp $destination/assets/vendor/slick/scss/slick-theme.min.css $destination/assets/vendor/slick/css/slick-theme.min.css
cp $destination/assets/vendor/slick/slick.min.css $destination/assets/vendor/slick/css/slick.min.css
cp $destination/assets/vendor/slick/slick-theme.min.css $destination/assets/vendor/slick/css/slick-theme.min.css
mv $destination/assets/vendor/slick/ajax-loader.gif $destination/assets/vendor/slick/css/ajax-loader.gif
mv $destination/assets/vendor/slick/fonts/ $destination/assets/vendor/slick/css/fonts/
cp $destination/assets/vendor/slick/slick.min.js $destination/assets/vendor/slick/js/slick.min.js
##clean
rm $destination/assets/vendor/ekko-lightbox/.gitignore

View File

@ -25,14 +25,14 @@ echo "Style of Tainacan for Gutenberg Editor Compiled";
sass bootstrap_custom.scss:../vendor/bootstrap/scss/bootstrap.min.css --style compressed
echo "Bootstrap Compiled";
rm -rf .sass-cache
cd ../vendor/slick/scss
cd ../vendor/slick
sass slick.scss:slick.min.css --style compressed
sass slick-theme.scss:slick-theme.min.css --style compressed
echo "Slick for slider carousel Compiled";
rm -rf slick-theme.min.css.map slick.min.css.map .sass-cache/
cd ../../../scss
rm -rf ../../style.css.map
# rm -rf ../../editor-style.css.map
cd ../../scss
rm -rf ../style.css.map
# rm -rf ../editor-style.css.map
echo "Sass compilation Completed!"
exit 0

View File

@ -21,7 +21,7 @@ echo "\nCopy Frameword CSS - Bootstrap ...\n\n";
echo "Copy Slick for Slider...\n\n";
if (!file_exists("src/assets/vendor/slick")) {
mkdir("src/assets/vendor/slick/", 0777, true);
mkdir("src/assets/vendor/slick/scss", 0777, true);
mkdir("src/assets/vendor/slick/css", 0777, true);
mkdir("src/assets/vendor/slick/js", 0777, true);
mkdir("src/assets/vendor/slick/fonts", 0777, true);
}

View File

@ -1,8 +1,8 @@
=== Tainacan Interface ===
Contributors: andrebenedito, daltonmartins, fabianobn, jacsonp, leogermani, weryques, wetah, eduardohumberto, ravipassos, jessicafpx, marinagiolo, omarceloavila
Requires at least: WordPress 4.8
Tested up to: WordPress 5.2.2
Version: 1.4
Tested up to: WordPress 5.2.4
Version: 1.5
Requires PHP: 5.6
Stable tag: trunk
License: GNU General Public License v3

View File

@ -130,10 +130,7 @@ jQuery( document ).ready(function( $ ) {
}
var $subMenu = $(this).next(".dropdown-menu");
$subMenu.toggleClass('show');
if($subMenu.hasClass('show')) {
$subMenu.find('.dropdown-submenu').attr('style', 'padding-left: 3rem !important');
$subMenu.find('.dropdown-item').attr('style', 'padding-left: 3rem');
}
return false;
});

View File

@ -14,16 +14,6 @@
color: #898d8f;
}
.form-row{
@media only screen and (min-width: 768px){
.form-row--avartar {
flex: 0 0 5.333333%;
max-width: 5.333333%;
}
.form-row--textarea {
flex: 0 0 94.666667%;
max-width: 94.666667%;
}
}
img {
width: 50px;
height: 50px;

View File

@ -1,3 +1,25 @@
// Register palette classes for colors
.has-default-color { color: #298596 !important; }
.has-default-background-color { background-color: #298596 !important; }
.has-carmine-color { color: #8c442c !important; }
.has-carmine-background-color { background-color: #8c442c !important; }
.has-cherry-color { color: #A12B42 !important; }
.has-cherry-background-color { background-color: #A12B42 !important; }
.has-mustard-color { color: #754E24 !important; }
.has-mustard-background-color { background-color: #754E24 !important; }
.has-mintgreen-color { color: #255F56 !important; }
.has-mintgreen-background-color { background-color: #255F56 !important; }
.has-darkturquoise-color { color: #205E6F !important; }
.has-darkturquoise-background-color { background-color: #205E6F !important; }
.has-turquoise-color { color: #185F6D !important; }
.has-turquoise-background-color { background-color: #185F6D !important; }
.has-blueheavenly-color { color: #1D5C86 !important; }
.has-blueheavenly-background-color { background-color: #1D5C86 !important; }
.has-purple-color { color: #4751a3 !important; }
.has-purple-background-color { background-color: #4751a3 !important; }
.has-violet-color { color: #955ba5 !important; }
.has-violet-background-color { background-color: #955ba5 !important; }
.alignwide {
margin-left: calc(-8.3333333333vw + 3.1%) !important;
margin-right: calc(-8.3333333333vw + 3.1%) !important;
@ -22,7 +44,7 @@
position: relative;
@media only screen and (min-width: 1526px) {
left: 30px;
width: 100% !important;
}
}
@ -69,14 +91,24 @@
}
}
/* Cover block */
.wp-block-cover__inner-container{
max-width: 1400px;
margin: 0 auto;
padding: 0 8.3333333333%;
padding: 0 8.3333333333vw;
}
/* Carousel */
.wp-block-tainacan-carousel-items-list.alignwide .tainacan-carousel,
.wp-block-tainacan-carousel-collections-list.alignwide .tainacan-carousel {
.wp-block-tainacan-carousel-collections-list.alignwide .tainacan-carousel,
.wp-block-tainacan-carousel-terms-list.alignwide .tainacan-carousel {
width: 100%;
left: 0;
}
.wp-block-tainacan-carousel-items-list.alignfull .tainacan-carousel,
.wp-block-tainacan-carousel-collections-list.alignfull .tainacan-carousel {
.wp-block-tainacan-carousel-collections-list.alignfull .tainacan-carousel
.wp-block-tainacan-carousel-terms-list.alignfull .tainacan-carousel {
width: 100%;
width: 100vw;
left: 0;

View File

@ -18,7 +18,6 @@
> .container-fluid {
> .page-header-image {
background-repeat: no-repeat;
background-position: center;
background-size: cover;
@media only screen and (max-width: 576px) {
height: 360px;

View File

@ -276,11 +276,6 @@
.blocks-gallery-item{
figure{
margin: 0 !important;
figcaption{
padding: 10px 10px 5px;
background: #fff;
color: #000;
}
}
img {
height: 100% !important;
@ -356,6 +351,7 @@
}
display: flex;
justify-content: center;
> iframe, img.attachment-large {
display: block;
height: auto;
@ -406,6 +402,7 @@
font-size: 0.875rem;
text-align: center;
word-break: break-all;
line-height: 1.5rem
}
a,
a:focus,
@ -415,6 +412,10 @@
cursor: pointer;
color: black;
}
.attachment-without-image img {
padding: 42px;
background-color: #dbdbdb;
}
}
.single-item-collection--attachments-prev {
left: -50px;

View File

@ -3,7 +3,7 @@ Theme Name: Tainacan Interface
Author: MediaLab UFG
Author URI: https://tainacan.org
Description: This is the default theme for the Tainacan project. Use this in conjunction with Tainacan plugin to easily manage and publish you digital collectinons with a beautiful faceted search interface. Ideal for museums, galleries, libraries and anyone who have a digital repository.
Version: 1.4
Version: 1.5
License: GNU General Public License v3
License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
Tags: two-columns, right-sidebar, grid-layout, flexible-header, custom-colors, custom-header, custom-menu, custom-logo, featured-images, footer-widgets, theme-options, threaded-comments, translation-ready, photography, portfolio
@ -92,28 +92,50 @@ body.loading-content main:before {
.dropdown-item {
border-radius: 0 !important;
}
.menu-item-has-children .dropdown-toggle {
padding-left: 1.25rem !important;
padding-right: 1rem !important;
}
}
.menu-item-has-children {
.dropdown-submenu {
padding: 0.35rem 0 0.35rem 0.5rem !important;
margin-left: 0.5rem;
}
.dropdown-menu {
.show {
border-top: none;
margin-left: -1px;
}
}
.dropdown.menu-item-has-children {
display: inline-flex;
flex-wrap: wrap;
.dropdown-submenu {
padding: 0.35rem 0 0.35rem 0.5rem;
}
ul.show {
li {
&.current_page_item, &.current-menu-item{
&.current_page_item, &.current-menu-item {
> a {
border-bottom: 1px solid #298596;
border: none;
background-color: #d9eced;
}
}
.dropdown-menu {
&.show {
position: relative;
width: 100%;
margin-left: 8px;
border-left: none !important;
border-right: none !important;
animation: sub-menu-expand 0.5s linear;
}
}
}
}
@media screen and (max-width: 768px) {
display: flex;
ul.show {
position: relative;
width: 100%;
top: 0;
margin-left: 16px;
border-left: none !important;
border-right: none !important;
animation: sub-menu-expand 0.5s linear;
}
}
}
@ -162,8 +184,9 @@ body.loading-content main:before {
nav{
&.menu-shadow{
max-height: 50px;
min-height: 50px;
border-bottom: none;
padding: 0;
.max-large{
margin: 0 4.16666666667%;
margin: 0 4.16666666667vw;
@ -213,14 +236,24 @@ nav{
}
}
.tainacan-logo {
h1{
padding: 8px 0;
width: auto;
h1 {
font-size: 1.5rem;
margin: 0;
margin: 0.36rem 0;
}
.logo {
max-height: 30px;
width: auto;
// max-width: 134px;
height: auto;
max-width: 225px;
max-height: 120px;
}
@media only screen and (max-width: 576px){
h1 {
font-size: 1.125rem;
margin: 0.36rem 0;
}
.logo { max-width: 175px; }
}
}
}
@ -228,7 +261,7 @@ nav{
.tainacan-search-form {
.form-control {
height: 27px;
font-size: 0.75rem;
font-size: 0.875rem;
font-weight: 400;
color: #898d8f;
}
@ -255,7 +288,7 @@ nav{
}
.form-control {
border-radius: 0;
font-size: 0.75rem;
font-size: 0.875rem;
font-weight: 400;
color: #898d8f;
}
@ -266,28 +299,24 @@ nav{
.tainacan-icon-close { display: block !important; }
}
}
.dropdown-menu .menu-item {
&:hover .dropdown-item {
background-color: #cbcbcb;
}
.dropdown-item:hover {
background-color: #dbdbdb !important;
}
&.menu-belowheader{
@media only screen and (min-width: 992px){
height: 70px;
}
&.menu-belowheader {
#menubelowHeader{
> ul{
display: flex;
flex-wrap: wrap;
justify-content: flex-end;
> li{
&.menu-item {
padding-right: 60px;
padding-right: 48px;
a{
a {
font-size: 0.875rem;
font-weight: 400;
color: #000;
margin-right: .5rem;
padding-left: 0;
padding-right: 0;
white-space: nowrap;
position: relative;
&::after{
@ -295,10 +324,10 @@ nav{
margin-left: 10px;
margin-bottom: -2px;
}
&:hover{
&:hover {
color: #000;
&:before {
&::before {
content: "";
width: 100%;
height: 1px;
@ -307,8 +336,8 @@ nav{
display: block;
position: absolute;
left: 0;
bottom: 0.5rem;
background-color: #298596;;
bottom: 0.375rem;
background-color: #298596;
}
}
&.dropdown-item {
@ -334,8 +363,9 @@ nav{
> a {
border-bottom: 1px solid #298596;
padding: 0;
margin-right: 0.5rem;
margin-top: 0.5rem;
padding-right: .5rem;
padding-left: .5rem;
&:hover:before { bottom: 0; }
}
@ -352,11 +382,11 @@ nav{
right: 0;
border: 1px solid #dbdbdb;
background-color: #fff;
z-index: 2;
z-index: 3;
& > ul > li.menu-item a {
margin: 0;
padding: 3px 12px;
padding: 0.625rem 1.5rem !important;
&:before { display: none !important; }
@ -390,9 +420,14 @@ nav{
}
.navbar {
border: none;
border: none;
padding: 0.6rem 1rem;
.navbar-brand {
padding: 0;
margin-right: 0;
}
& > .container-fluid {
align-items: flex-end;
}
}
.navbar.navbar--border-bottom {
@ -420,10 +455,13 @@ nav{
nav.menu-belowheader #menubelowHeader > ul > li.menu-item a {
max-width: 240px;
width: 100%;
overflow: hidden;
}
& > .navbar { margin-right: 16px; }
& > .navbar {
margin-right: 16px !important;
}
.tainacan-icon-menu,
.tainacan-icon-close {
@ -444,7 +482,7 @@ nav{
}
}
.navbar--border-bottom {
border-bottom: 2px solid #ededed !important;
border-bottom: 1px solid #ededed !important;
}
.tainacan-search-form {
@ -808,6 +846,20 @@ nav{
}
}
// Sub menu animation for menu headers
@keyframes sub-menu-expand {
from {
overflow-y: hidden;
opacity: 0.5;
max-height: 0px;
}
to {
overflow-y: auto;
opacity: 1;
max-height: 600px;
}
}
@import "_gutenberg-support";
@import "_comments";

View File

@ -36,7 +36,7 @@ if ( post_password_required() ) {
</div>
<?php
$user_link = sprintf( '<a href="%1$s" class="font-weight-light">%2$s</a>', get_author_posts_url( $current_user->ID ), $current_user->display_name );
$user_link = sprintf( '<a href="%1$s" class="font-weight-normal">%2$s</a>', get_author_posts_url( $current_user->ID ), $current_user->display_name );
$comment_args = array(
'logged_in_as' => '<span class="text-oslo-gray authenticated d-inline d-sm-none mb-4">' .
// translators: placeholder is the user name with link to its page

View File

@ -50,7 +50,7 @@ if ( ! function_exists( 'tainacan_setup' ) ) {
$logo_args = array(
'height' => 30,
'width' => 175,
'flex-height' => false,
'flex-height' => true,
'flex-width' => true,
);
add_theme_support( 'custom-logo', $logo_args );
@ -323,7 +323,7 @@ function tainacan_editor_styles() {
wp_enqueue_style( 'tainacan-editor-style', get_template_directory_uri() . '/editor-style.css' );
// Adds Robot fonts to Gutenberg.
wp_enqueue_style( 'RobotoFonts', 'https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i' );
wp_enqueue_style( 'RobotoFonts', 'https://fonts.googleapis.com/css?family=Roboto:400,400i,500,500i,700,700i' );
// Adds customizer colors to Gutenberg.
//wp_add_inline_style( 'tainacan-customizer-editor-style', tainacan_customizer_gutenberg_colors() );

View File

@ -582,7 +582,9 @@ function tainacan_get_color_scheme_css( $colors ) {
.tainacan-content .wp-block-tainacan-carousel-items-list .swiper-button-prev svg,
.tainacan-content .wp-block-tainacan-carousel-items-list .swiper-button-next svg,
.tainacan-content .wp-block-tainacan-carousel-collections-list .swiper-button-prev svg,
.tainacan-content .wp-block-tainacan-carousel-collections-list .swiper-button-next svg {
.tainacan-content .wp-block-tainacan-carousel-collections-list .swiper-button-next svg,
.tainacan-content .wp-block-tainacan-carousel-terms-list .swiper-button-prev svg,
.tainacan-content .wp-block-tainacan-carousel-terms-list .swiper-button-next svg {
fill: {$colors['tainacan_link_color']} !important;
}

View File

@ -12,7 +12,7 @@ if ( ! function_exists( 'tainacan_enqueues' ) ) {
* Bootstrap 4.1.3
*/
//Style
wp_register_style( 'bootstrap4CSS', get_template_directory_uri() . '/assets/vendor/bootstrap/css/bootstrap.min.css' );
wp_register_style( 'bootstrap4CSS', get_template_directory_uri() . '/assets/vendor/bootstrap/scss/bootstrap.min.css' );
wp_enqueue_style( 'bootstrap4CSS' );
//Javascript
wp_register_script( 'bootstrap4JS', get_template_directory_uri() . '/assets/vendor/bootstrap/js/bootstrap.min.js', array( 'jquery' ), '', true );
@ -33,16 +33,16 @@ if ( ! function_exists( 'tainacan_enqueues' ) ) {
/**
* Ekko Lightbox
*/
wp_register_style( 'EkkoLightboxCss', get_template_directory_uri() . '/assets/vendor/ekko-lightbox/ekko-lightbox.min.css');
wp_register_style( 'EkkoLightboxCss', get_template_directory_uri() . '/assets/vendor/ekko-lightbox/dist/ekko-lightbox.css');
wp_enqueue_style( 'EkkoLightboxCss' );
wp_register_script( 'EkkoLightboxJs', get_template_directory_uri() . '/assets/vendor/ekko-lightbox/ekko-lightbox.min.js', array('jquery'), null, true);
wp_register_script( 'EkkoLightboxJs', get_template_directory_uri() . '/assets/vendor/ekko-lightbox/dist/ekko-lightbox.min.js', array('jquery'), null, true);
wp_enqueue_script( 'EkkoLightboxJs' );
/**
* Google
*/
// Google fonts Roboto
wp_enqueue_style( 'RobotoFonts', 'https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i' );
wp_enqueue_style( 'RobotoFonts', 'https://fonts.googleapis.com/css?family=Roboto:400,400i,500,500i,700,700i' );
/**
* Tainacan Theme

View File

@ -404,9 +404,9 @@ msgstr "Nenhum"
#~ msgstr "Cor que irá preencher a área de cabeçalho do tema"
#~ msgid ""
#~ "Authenticated as <a href=\"%1$s\" class=\"font-weight-light\">%2$s</a>"
#~ "Authenticated as <a href=\"%1$s\" class=\"font-weight-normal\">%2$s</a>"
#~ msgstr ""
#~ "Conectado como <a href=\"%1$s\" class=\"font-weight-light\">%2$s</a>"
#~ "Conectado como <a href=\"%1$s\" class=\"font-weight-normal\">%2$s</a>"
#~ msgid "Anonymous"
#~ msgstr "Anônimo"

7
src/style.css.map Normal file

File diff suppressed because one or more lines are too long

View File

@ -82,9 +82,11 @@
<div class="single-item-collection--attachments">
<?php foreach ( $attachments as $attachment ) { ?>
<div class="single-item-collection--attachments-file">
<a href="<?php echo $attachment->guid; ?>" data-toggle="lightbox" data-gallery="example-gallery">
<a
class="<?php if (!wp_get_attachment_image( $attachment->ID, 'tainacan-interface-item-attachments')) echo'attachment-without-image'; ?>"
href="<?php echo wp_get_attachment_url($attachment->ID, 'large'); ?>" data-toggle="lightbox" data-disable-external-check="true" data-gallery="example-gallery">
<?php
echo wp_get_attachment_image( $attachment->ID, 'tainacan-interface-item-attachments' );
echo wp_get_attachment_image( $attachment->ID, 'tainacan-interface-item-attachments', true );
echo get_the_title( $attachment->ID );
?>
</a>

View File

@ -1,18 +1,24 @@
<?php if ( have_posts() ) : ?>
<?php while ( have_posts() ) : the_post(); ?>
<div class="tainacan-title">
<div class="border-bottom border-jelly-bean tainacan-title-page" style="border-width: 2px !important;">
<ul class="list-inline mb-1">
<li class="list-inline-item text-midnight-blue font-weight-bold title-page">
<?php the_title(); ?>
</li>
<li class="list-inline-item float-right title-back"><a href="javascript:history.go(-1)"><?php _e( 'Back', 'tainacan-interface' ); ?></a></li>
</ul>
<?php if ( get_the_title() != '') : ?>
<div class="tainacan-title">
<div class="border-bottom border-jelly-bean tainacan-title-page" style="border-width: 2px !important;">
<ul class="list-inline mb-1">
<li class="list-inline-item text-midnight-blue font-weight-bold title-page">
<?php the_title(); ?>
</li>
<li class="list-inline-item float-right title-back"><a href="javascript:history.go(-1)"><?php _e( 'Back', 'tainacan-interface' ); ?></a></li>
</ul>
</div>
</div>
</div>
<div class="mt-3 tainacan-single-post">
<?php get_template_part( 'template-parts/single-post' ); ?>
</div>
<div class="mt-3 tainacan-single-post">
<?php get_template_part( 'template-parts/single-post' ); ?>
</div>
<?php else: ?>
<div class="mt-0 tainacan-single-post">
<?php get_template_part( 'template-parts/single-post' ); ?>
</div>
<?php endif; ?>
<?php if ( ! is_singular( 'page' ) ) : ?>
<div class="row justify-content-between">
<span class="nav-previous"><?php previous_post_link( '%link', __( '<span class="meta-nav">&larr;</span> Previous', 'tainacan-interface' ) ); ?></span>

View File

@ -1,26 +1,28 @@
<article role="article" id="post_<?php the_ID()?>" <?php post_class()?>>
<header class="mb-4">
<div class="header-meta text-muted mb-5 d-flex">
<?php if ( ! is_singular( 'page' ) ) { ?>
<?php tainacan_meta_date_author(); ?>
<?php } ?>
<div class="btn-group ml-auto" role="group">
<?php if ( true == get_theme_mod( 'tainacan_facebook_share', true ) ) : ?>
<a href="http://www.facebook.com/sharer.php?u=<?php the_permalink(); ?>" class="" target="_blank">
<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/facebook-circle.png'; ?>" alt="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
</a>
<?php endif; ?>
<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) ) : ?>
<?php $twitter_option = get_theme_mod( 'tainacan_twitter_user' ); ?>
<?php $via = ! empty( $twitter_option ) ? '&amp;via=' . esc_attr( get_theme_mod( 'tainacan_twitter_user' ) ) : ''; ?>
<a href="http://twitter.com/share?url=<?php the_permalink(); ?>&amp;text=<?php the_title_attribute(); ?><?php echo $via; ?>" target="_blank" class="">
<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/twitter-circle.png'; ?>" alt="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
</a>
<?php endif; ?>
<?php if ( get_the_title() != '') : ?>
<header class="mb-4">
<div class="header-meta text-muted mb-5 d-flex">
<?php if ( ! is_singular( 'page' ) ) { ?>
<?php tainacan_meta_date_author(); ?>
<?php } ?>
<div class="btn-group ml-auto" role="group">
<?php if ( true == get_theme_mod( 'tainacan_facebook_share', true ) ) : ?>
<a href="http://www.facebook.com/sharer.php?u=<?php the_permalink(); ?>" class="" target="_blank">
<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/facebook-circle.png'; ?>" alt="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
</a>
<?php endif; ?>
<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) ) : ?>
<?php $twitter_option = get_theme_mod( 'tainacan_twitter_user' ); ?>
<?php $via = ! empty( $twitter_option ) ? '&amp;via=' . esc_attr( get_theme_mod( 'tainacan_twitter_user' ) ) : ''; ?>
<a href="http://twitter.com/share?url=<?php the_permalink(); ?>&amp;text=<?php the_title_attribute(); ?><?php echo $via; ?>" target="_blank" class="">
<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/twitter-circle.png'; ?>" alt="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
</a>
<?php endif; ?>
</div>
</div>
</div>
<?php the_post_thumbnail(); ?>
</header>
<?php the_post_thumbnail(); ?>
</header>
<?php endif; ?>
<section class="tainacan-content text-black margin-two-column">
<?php
the_content();