Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
fabs balvedi 2018-11-29 08:27:57 -02:00
commit 592c58fb6c
4 changed files with 57 additions and 6 deletions

View File

@ -1,8 +1,15 @@
(function($) {
$.fn.tainacan_interface_truncate = function (settings) {
if(window.innerWidth <= 576) {
count = 150;
}else if(window.innerWidth <= 360) {
count = 87;
} else {
count = 350;
}
var config = {
showChars: 350,
minChars: 350,
showChars: count,
minChars: count,
ellipsesText: "...",
moreText: tainacan_trucanteVars.moreText,
lessText: tainacan_trucanteVars.lessText

View File

@ -98,7 +98,7 @@
margin-top: 0.5rem;
}
&.tainacan-interface-truncate {
height: 65px;
min-height: 65px;
margin-bottom: 2rem;
.tainacan-interface-more, .tainacan-interface-less {
color: rgba(255, 255, 255, 0.60);
@ -106,7 +106,7 @@
}
&.full-story {
height: auto;
margin-bottom: 1rem;
margin-bottom: 2rem;
}
}
}

View File

@ -389,7 +389,7 @@ nav{
height: 400px;
> div {
&.ph-title-description{
@media only screen and (min-width: 768px){
@media only screen and (min-width: 577px){
margin-bottom: 3.75rem;
}
}

View File

@ -584,7 +584,8 @@ function tainacan_get_color_scheme_css( $colors ) {
nav .dropdown-menu .dropdown-item:hover {
background-color: {$colors['backtransparent']};
}
.tainacan-single-post #comments .title-leave {
.tainacan-single-post #comments .title-leave,
.tainacan-single-post article .title-content-items {
color: {$colors['tainacan_link_color']} !important;
}
footer hr.bg-scooter {
@ -605,6 +606,49 @@ function tainacan_get_color_scheme_css( $colors ) {
/**
* Plugin Tainacan
*/
/* Selected Item background ------------------------------------------- */
.table-container .table-wrapper table.tainacan-table tbody tr.selected-row,
.table-container .table-wrapper table.tainacan-table tbody tr.selected-row .checkbox-cell .checkbox,
.table-container .table-wrapper table.tainacan-table tbody tr.selected-row .actions-cell .actions-container
.tainacan-cards-container .selected-card .metadata-title,
.tainacan-records-container .selected-record .metadata-title,
.tainacan-grid-container .selected-grid-item.
.tainacan-masonry-container .selected-masonry-item {
background-color: {$colors['tainacan_link_color']};
}
/* // - Selected Item Title ------------------------------------------- */
.table-container .table-wrapper table.tainacan-table tbody tr.selected-row has-text-secondary,
.table-container .table-wrapper table.tainacan-table tbody tr.selected-row p,
.tainacan-cards-container .selected-card .metadata-title p,
.tainacan-records-container .selected-record .metadata-title p{
color: {$colors['tainacan_link_color']} !important;
}
/* // - Selected Item Checkbox ------------------------------------------- */
.table-container .table-wrapper table.tainacan-table tbody tr.selected-row checkbox-cell .b-checkbox.checkbox input[type="checkbox"]:checked + .check,
.tainacan-cards-container .selected-card .card-checkbox .b-checkbox.checkbox input[type="checkbox"]:checked + .check,
.tainacan-grid-container .selected-grid-item .grid-item-checkbox .b-checkbox.checkbox input[type="checkbox"]:checked + .check,
.tainacan-masonry-container .selected-masonry-item .masonry-item-checkbox .b-checkbox.checkbox input[type="checkbox"]:checked + .check,
.tainacan-records-container .selected-record .record-checkbox .b-checkbox.checkbox input[type="checkbox"]:checked + .check {
background-color: transparent;
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1 1'%3E%3Cpath style='fill:rgb(255,255,255)' d='M 0.04038059,0.6267767 0.14644661,0.52071068 0.42928932,0.80355339 0.3232233,0.90961941 z M 0.21715729,0.80355339 0.85355339,0.16715729 0.95961941,0.2732233 0.3232233,0.90961941 z'%3E%3C/path%3E%3C/svg%3E");
border-color: {$colors['tainacan_link_color']} !important;
}
.tainacan-slide-main-view .slide-control-arrow .icon .tainacan-icon::before {
color: {$colors['tainacan_link_color']};
}
.tainacan-slides-list #tainacan-slide-container .tainacan-slide-item.active-item img {
border-bottom: 4px solid {$colors['tainacan_link_color']};
}
/** Abas no modal de termos */
.tainacan-finder-columns-container .tabs li.is-active a {
border-bottom-color: {$colors['tainacan_link_color']};
color: black;
}
/* Setinhas no mesmo modal */
.tainacan-finder-columns-container a .tainacan-icon {
color: {$colors['tainacan_link_color']};
}
/* Dropdown Arrow */
.theme-items-list .dropdown .dropdown-trigger .button .icon,
.theme-items-list .autocomplete .dropdown-trigger .button .icon {