tmdinosaurcenter
/
tainacan-theme
mirror of https://github.com/tainacan/tainacan-theme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolvendo conflito

This commit is contained in:
Alvino Rodrigues 2019-03-21 10:21:15 -03:00
parent e87125de7e eca9a7987a
commit 6f3e2aad89
9 changed files with 47 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/assets/scss/_home-collection.scss
View File

@ -225,7 +225,7 @@
opacity: 0;
z-index: -10;
cursor: pointer;
transition: opacity 1s, z-index 0.3s, transform 1s;
transition: opacity 0.3s, z-index 0.3s, transform 0.3s;
transform: translateX(0);
color: #2c2d2d;
.mdi {
@ -258,8 +258,8 @@
}
&.active {
.btn-icon {
opacity: 1;
.btn {
opacity: 1 !important;
z-index: 50;
}
}

25
src/functions.php
View File

@ -299,13 +299,34 @@ function tainacan_theme_collection_query( $query ) {
}
add_action( 'pre_get_posts', 'tainacan_theme_collection_query' );
/**
* Render customizer colors to Gutenberg.
*/
function tainacan_customizer_gutenberg_colors() {
// Retrieve the link color from the Customizer.
$link_color = get_theme_mod( 'tainacan_link_color', 'default' );
// Build styles.
$css = '';
$css .= '.has-accent-color { color: ' . esc_attr( $link_color ) . ' !important; }';
$css .= '.has-accent-background-color { background-color: ' . esc_attr( $link_color ) . '; }';
return wp_strip_all_tags( $css );
}
/**
* Enqueue editor styles for Gutenberg
*/
function tainacan_editor_styles() {
// Adds Tainacan editor style for Gutenberg.
wp_enqueue_style( 'tainacan-editor-style', get_template_directory_uri() . '/editor-style.css' );
wp_enqueue_style( 'RobotoFonts', 'https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i' );
// 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' );
// Adds customizer colors to Gutenberg.
//wp_add_inline_style( 'tainacan-customizer-editor-style', tainacan_customizer_gutenberg_colors() );
}
add_action( 'enqueue_block_editor_assets', 'tainacan_editor_styles' );

4
src/functions/breadcrumb.php
View File

@ -17,11 +17,11 @@ function tainacan_interface_the_breadcrumb() {
if (is_home() || is_front_page()) {
if ($showOnHome == 1) echo '<nav aria-label="breadcrumb" class="d-none d-md-flex mt-3 border-bottom-0 max-large margin-one-column text-jelly-bean"><a href="' . $homeLink . '">' . $home . '</a></nav>';
if ($showOnHome == 1) echo '<nav aria-label="breadcrumb" class="d-none d-md-flex mt-3 border-bottom-0 max-large margin-one-column"><a href="' . $homeLink . '">' . $home . '</a></nav>';
} else {
echo '<nav aria-label="breadcrumb" class="d-md-flex mt-3 mb-3 border-bottom-0 max-large margin-one-column text-jelly-bean "><a href="' . $homeLink . '">' . $home . '</a>&nbsp;' . $delimiter . '&nbsp;';
echo '<nav aria-label="breadcrumb" class="d-md-flex mt-3 mb-3 border-bottom-0 max-large margin-one-column"><a href="' . $homeLink . '">' . $home . '</a>&nbsp;' . $delimiter . '&nbsp;';
if ( is_category() ) {
$thisCat = get_category(get_query_var('cat'), false);

32
src/functions/customizer.php
View File

@ -142,21 +142,6 @@ function tainacan_customize_register( $wp_customize ) {
'section' => 'tainacan_social_share',
) );
//Google Plus
$wp_customize->add_setting( 'tainacan_google_share', array(
'type' => 'theme_mod',
'default' => true,
'capability' => 'edit_theme_options',
'sanitize_callback' => 'tainacan_display_callback_sanitize_checkbox',
) );
$wp_customize->add_control( 'tainacan_google_share', array(
'type' => 'checkbox',
'settings' => 'tainacan_google_share',
'section' => 'tainacan_social_share',
'label' => __( 'Display Google Plus button', 'tainacan-interface' ),
) );
/**
* Add color scheme setting and control.
*/
@ -597,6 +582,13 @@ function tainacan_get_color_scheme_css( $colors ) {
nav .dropdown-menu .dropdown-item:hover {
background-color: {$colors['backtransparent']};
}
nav.menu-belowheader #menubelowHeader > ul > li.current_page_item > a,
nav.menu-belowheader #menubelowHeader > ul > li.current-menu-item > a {
border-color: {$colors['tainacan_link_color']};
}
nav.menu-belowheader #menubelowHeader > ul > li.menu-item a:hover::before {
background-color: {$colors['tainacan_link_color']};
}
.tainacan-single-post #comments .title-leave,
.tainacan-single-post article .title-content-items,
.tainacan-single-post article .tainacan-content h1 {
@ -621,6 +613,16 @@ function tainacan_get_color_scheme_css( $colors ) {
color: {$colors['tainacan_link_color']} !important;
}
/**
* Tainacan Taxonomy Archive Page
*/
.page-header-taxonomy > .container-fluid > .page-header-content > .page-header-content-meta > .page-header-content-title {
border-color: {$colors['tainacan_link_color']} !important;
}
.page-header-taxonomy > .container-fluid > .page-header-content > .page-header-content-meta > .page-header-content-title .page-header-title {
color: {$colors['tainacan_link_color']};
}
/**
* Tainacan Collections
*/

5
src/tainacan/single-items.php
View File

@ -129,11 +129,6 @@
<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 ( true == get_theme_mod( 'tainacan_google_share', true ) ) : ?>
<a href="https://plus.google.com/share?url=<?php the_permalink(); ?>" target="_blank" class="item-card-link--sharing">
<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/google-plus-circle.png'; ?>" alt="<?php esc_attr_e('Share this on google plus', 'tainacan-interface') ?>">
</a>
<?php endif; ?>
</div>
</div>
</div>

9
src/template-parts/header-social-share.php
View File

@ -13,15 +13,6 @@
</a>
</div>
<?php endif; ?>
<?php if ( true == get_theme_mod( 'tainacan_google_share', true ) ) : ?>
<div class="rotater">
<a href="https://plus.google.com/share?url=<?php echo esc_url( home_url( $wp->request ) ); ?>" target="_blank">
<div class="btn btn-icon">
<i class="mdi mdi-google-plus"></i>
</div>
</a>
</div>
<?php endif; ?>
<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) && get_theme_mod( 'tainacan_twitter_user' ) ) : ?>
<div class="rotater">
<a href="http://twitter.com/share?url=<?php echo esc_url( home_url( $wp->request ) ); ?>&amp;text=<?php the_title_attribute(); ?>&amp;via=<?php echo esc_attr( get_theme_mod( 'tainacan_twitter_user', '' ) ); ?>" target="_blank">

9
src/template-parts/headercollection.php
View File

@ -61,15 +61,6 @@ echo '</style>';
</a>
</div>
<?php endif; ?>
<?php if ( true == get_theme_mod( 'tainacan_google_share', true ) ) : ?>
<div class="rotater">
<a href="https://plus.google.com/share?url=<?php echo esc_url( home_url( $wp->request ) ); ?>" target="_blank">
<div class="btn btn-icon">
<i class="mdi mdi-google-plus"></i>
</div>
</a>
</div>
<?php endif; ?>
<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) && get_theme_mod( 'tainacan_twitter_user' ) ) : ?>
<div class="rotater">
<a href="http://twitter.com/share?url=<?php echo esc_url( home_url( $wp->request ) ); ?>&amp;text=<?php the_title_attribute(); ?>&amp;via=<?php echo esc_attr( get_theme_mod( 'tainacan_twitter_user', '' ) ); ?>" target="_blank">

9
src/template-parts/headertaxonomy.php
View File

@ -32,11 +32,11 @@ $src = wp_get_attachment_image_src($image, 'full');
</div>
<?php $tainacan_term_description = tainacan_get_the_term_description(); ?>
<div class="page-header-hightlights d-flex flex-wrap">
<div class="col-12 col-lg-10 p-0 page-header-description">
<div class="col-12 col-xl-10 col-lg-9 p-0 page-header-description">
<?php echo $tainacan_term_description; ?>
</div>
<?php do_action( 'tainacan-interface-taxonoy-description' ); ?>
<div class="col-12 col-lg-2 d-flex flex-wrap page-header-share">
<div class="col-12 col-xl-2 col-lg-3 d-flex flex-wrap page-header-share">
<div class="page-header-icons">
<p class="share-title"><?php _e('Share', 'tainacan-interface'); ?></p>
<?php if ( true == get_theme_mod( 'tainacan_facebook_share', true ) ) : ?>
@ -51,11 +51,6 @@ $src = wp_get_attachment_image_src($image, 'full');
<img src="<?php echo get_template_directory_uri() . '/assets/images/twitter-circle.png'; ?>" alt="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>" class="share-images">
</a>
<?php endif; ?>
<?php if ( true == get_theme_mod( 'tainacan_google_share', true ) ) : ?>
<a href="https://plus.google.com/share?url=<?php the_permalink(); ?>" target="_blank" class="share-link">
<img src="<?php echo get_template_directory_uri() . '/assets/images/google-plus-circle.png'; ?>" alt="<?php esc_attr_e('Share this on google plus', 'tainacan-interface') ?>" class="share-images">
</a>
<?php endif; ?>
</div>
</div>
</div>

5
src/template-parts/single-post.php
View File

@ -17,11 +17,6 @@
<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 ( true == get_theme_mod( 'tainacan_google_share', true ) ) : ?>
<a href="https://plus.google.com/share?url=<?php the_permalink(); ?>" target="_blank" class="">
<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/google-plus-circle.png'; ?>" alt="<?php esc_attr_e('Share this on google plus', 'tainacan-interface') ?>">
</a>
<?php endif; ?>
</div>
</div>
<?php the_post_thumbnail(); ?>