From 1ddae4f4c420306de88a43f7f164e9489ab1c592 Mon Sep 17 00:00:00 2001 From: Leo Germani Date: Wed, 29 Aug 2018 15:57:37 -0300 Subject: [PATCH 1/7] dummy commit. testing CI --- src/footer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/footer.php b/src/footer.php index 2b213d0..75fca9d 100644 --- a/src/footer.php +++ b/src/footer.php @@ -60,4 +60,5 @@ + \ No newline at end of file From 6a931faee1f3d1ece381a05f5e7f40b293ad4c15 Mon Sep 17 00:00:00 2001 From: Fabiano Date: Wed, 29 Aug 2018 11:25:02 -0300 Subject: [PATCH 2/7] Fix Theme Sniffer Check of Wordpress publish theme --- src/comments.php | 6 +++--- src/footer.php | 2 +- src/functions.php | 23 +++++++++++------------ src/functions/enqueues.php | 1 + src/functions/single-functions.php | 1 - src/header.php | 1 - src/tainacan/single-items.php | 5 +++-- src/template-parts/headerCollection.php | 3 ++- src/template-parts/headerTaxonomy.php | 3 ++- src/template-parts/single-post.php | 3 ++- 10 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/comments.php b/src/comments.php index ce84eda..da26463 100644 --- a/src/comments.php +++ b/src/comments.php @@ -20,7 +20,7 @@ if (post_password_required()) {

- ", "" ); ?> + ", "" ); ?>

@@ -36,7 +36,7 @@ if (post_password_required()) {
''. sprintf( __('Authenticated as %2$s', 'tainacan-theme'), get_author_posts_url($current_user->ID), $current_user->display_name) .'', @@ -48,7 +48,7 @@ if (post_password_required()) { 'cancel_reply_after' => '', 'class_submit' => 'btn btn-info bg-jungle-green align-self-center mt-3 float-right ml-auto comment-submit-link', 'label_submit' => __('Send', 'tainacan-theme'), - ]; + ); comment_form($comment_args); ?> diff --git a/src/footer.php b/src/footer.php index 75fca9d..ab7d349 100644 --- a/src/footer.php +++ b/src/footer.php @@ -50,7 +50,7 @@ Wordpress', 'Tainacan'); + printf(__('Proudly powered by %1$s and %2$s', 'tainacan-theme'), 'Wordpress', 'Tainacan'); } ?> diff --git a/src/functions.php b/src/functions.php index 13a8cdc..ef4ffa1 100644 --- a/src/functions.php +++ b/src/functions.php @@ -64,12 +64,12 @@ if(!function_exists('tainacan_setup')) { add_theme_support( 'custom-logo', $logo_args ); if (function_exists('tainacan_register_view_mode')) { - tainacan_register_view_mode('grid', [ + tainacan_register_view_mode('grid', array( 'label' => 'Thumbnail', 'description' => 'A thumbnail grid view, showing only title and thumbnail', 'icon' => '', 'dynamic_metadata' => false, - ]); + )); } add_image_size( 'tainacan-theme-list-post', 300, 200, true ); @@ -179,12 +179,11 @@ function tainacan_hex2rgb( $color ) { return array( 'red' => $r, 'green' => $g, 'blue' => $b ); } -add_filter( 'query_vars', function ( $public_query_vars ) { - +function tainacan_collections_viewmode($public_query_vars){ $public_query_vars[] = "tainacan_collections_viewmode"; return $public_query_vars; - -} ); +} +add_filter( 'query_vars', 'tainacan_collections_viewmode'); function tainacan_active($selected, $current = true, $echo = true) { @@ -197,20 +196,20 @@ function tainacan_active($selected, $current = true, $echo = true) { } -add_filter('get_the_archive_title', function($title) { +function tainacan_theme_collection_title($title){ if (is_post_type_archive('tainacan-collection')) { return __('Collections', 'tainacan-theme'); } return $title; -}); - -add_action('pre_get_posts', function($query) { +} +add_filter('get_the_archive_title', 'tainacan_theme_collection_title'); +function tainacan_theme_collection_query($query){ if ($query->is_main_query() && $query->is_post_type_archive('tainacan-collection')) { $query->set('posts_per_page', 12); } - -}); +} +add_action('pre_get_posts', 'tainacan_theme_collection_query'); require get_template_directory() . '/functions/customizer.php'; require get_template_directory() . '/functions/pagination.php'; diff --git a/src/functions/enqueues.php b/src/functions/enqueues.php index 0e247e7..dd35ebe 100644 --- a/src/functions/enqueues.php +++ b/src/functions/enqueues.php @@ -25,6 +25,7 @@ if ( ! function_exists('tainacan_Enqueues') ) { * Slick Slider Carousel */ //Styles + wp_enqueue_style('RobotoFonts', 'https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i'); wp_register_style('SlickCss', get_template_directory_uri() . '/assets/vendor/slick/css/slick.min.css', '', '1.6.1', ''); wp_register_style('SlickThemeCss', get_template_directory_uri() . '/assets/vendor/slick/css/slick-theme.min.css', '', '1.6.1', ''); wp_enqueue_style('SlickCss'); diff --git a/src/functions/single-functions.php b/src/functions/single-functions.php index 3dfd20f..4e79605 100644 --- a/src/functions/single-functions.php +++ b/src/functions/single-functions.php @@ -7,7 +7,6 @@ */ function tainacan_Comments_Callback($comment, $args, $depth) { //get comment to determine type - $GLOBALS['comment'] = $comment; global $post; //var_dump($args);die; $class_has = "has-children media comment-". $comment->comment_ID; ?> diff --git a/src/header.php b/src/header.php index fd0ef1b..23b9aa0 100644 --- a/src/header.php +++ b/src/header.php @@ -4,7 +4,6 @@ - diff --git a/src/tainacan/single-items.php b/src/tainacan/single-items.php index b63b8fc..609053a 100644 --- a/src/tainacan/single-items.php +++ b/src/tainacan/single-items.php @@ -102,7 +102,8 @@ - + + @@ -118,7 +119,7 @@
'

', 'after_title' => '

', 'before_value' => '

', 'after_value' => '

']; + $args = array('before_title' => '

', 'after_title' => '

', 'before_value' => '

', 'after_value' => '

'); //$field = null; tainacan_the_metadata($args); ?> diff --git a/src/template-parts/headerCollection.php b/src/template-parts/headerCollection.php index 1540c91..a58ef55 100644 --- a/src/template-parts/headerCollection.php +++ b/src/template-parts/headerCollection.php @@ -70,7 +70,8 @@

- + +
- + +
- + + From d10d7f1f75a3d798ca77c71ce07174f09d67eacc Mon Sep 17 00:00:00 2001 From: Fabiano Date: Wed, 29 Aug 2018 11:25:14 -0300 Subject: [PATCH 3/7] Remove comments scripts --- src/assets/js/js.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/assets/js/js.js b/src/assets/js/js.js index 93ab846..aea8e0e 100644 --- a/src/assets/js/js.js +++ b/src/assets/js/js.js @@ -80,21 +80,12 @@ jQuery(document).ready(function( $ ) { // instead of a settings object ] }); - //$('.t-collection--info-description-text').attr('style', 'display: block; max-height: 4.5em;'); - /* var t = $(".elimore"); - t.dotdotdot({ - keep: ".toggle" - }); - - var n = t.data("dotdotdot"); - t.on("click", ".toggle", function(e) { - t.preventDefault(), t.hasClass("ddd-truncated") ? (n.restore(), t.addClass("full-story")) : (t.removeClass("full-story"), n.truncate(), n.watch()) - }); */ }); jQuery(document).ready(function(e) { var t = e(".dotmore"); t.dotdotdot({ - keep: ".toggle" + keep: ".toggle", + height: "watch" }); var n = t.data("dotdotdot"); t.on("click", ".toggle", function(e) { From 0548e0f02fb13ac25bfb32d931d0020843d92737 Mon Sep 17 00:00:00 2001 From: Fabiano Date: Wed, 29 Aug 2018 11:25:34 -0300 Subject: [PATCH 4/7] Fix more and less description on collection page --- src/assets/scss/_home-collection.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/assets/scss/_home-collection.scss b/src/assets/scss/_home-collection.scss index 63cd378..68f7dde 100644 --- a/src/assets/scss/_home-collection.scss +++ b/src/assets/scss/_home-collection.scss @@ -96,13 +96,20 @@ } &.dotmore { height: 65px; + margin-bottom: 2rem; .toggle { color: #9d9fa0; + white-space: nowrap; } &.full-story { height: auto; margin-bottom: 1rem; } + &:not(.ddd-truncated):not(.full-story) { + .toggle { + display: none; + } + } } } } From 6c440840cf02461e94b2c5439cfcd29405b84385 Mon Sep 17 00:00:00 2001 From: Fabiano Date: Wed, 29 Aug 2018 11:26:20 -0300 Subject: [PATCH 5/7] Fix more for open to bottom --- src/assets/scss/style.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index 2f91a46..b868ffb 100644 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -315,9 +315,10 @@ nav{ } } &.page-collection{ - height: 400px !important; + height: auto; + padding-top: 250px; @media only screen and (max-width: 576px){ - height: 200px !important; + padding-top: 89.62px; } } &.page-height{ From b268d3d0f180196aebd504ea28196c4ba98d3541 Mon Sep 17 00:00:00 2001 From: Fabiano Date: Wed, 29 Aug 2018 16:40:00 -0300 Subject: [PATCH 6/7] Added class to table on create post or page --- src/assets/js/js.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/assets/js/js.js b/src/assets/js/js.js index aea8e0e..278cc3e 100644 --- a/src/assets/js/js.js +++ b/src/assets/js/js.js @@ -25,6 +25,9 @@ jQuery(document).ready(function( $ ) { */ $('#comments ul.children').addClass('align-children'); + + $('.tainacan-single-post .tainacan-content table').addClass('table table-borderless'); + /** * Add the icon on previous and next pagination in comment list */ From f4a5ccea7e43213f96db240c07cae9900a4c254f Mon Sep 17 00:00:00 2001 From: Fabiano Date: Wed, 29 Aug 2018 16:40:13 -0300 Subject: [PATCH 7/7] Style to blockquote --- src/assets/scss/_post.scss | 48 ++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/src/assets/scss/_post.scss b/src/assets/scss/_post.scss index e52c404..9bfee4b 100644 --- a/src/assets/scss/_post.scss +++ b/src/assets/scss/_post.scss @@ -44,6 +44,23 @@ &h1, &h2{ font-size: 1rem; } + blockquote:not(.wp-block-pullquote), .wp-block-quote { + color: #898d8f; + font-weight: 400; + padding: 1rem; + border-left:2px solid #298596; + margin-left: 4.16666666667%; + margin-right: 4.16666666667%; + cite { + float: right; + color: #298596; + } + } + .table { + thead { + border-bottom: 1px solid #cbcbcb; + } + } img[class*="align"], img[class*="wp-image-"], .gallery { @@ -118,26 +135,6 @@ margin-right: auto; } } - /* .wp-caption { - background: #cbcbcb; - margin-bottom: 1.625em; - max-width: 96%; - max-width: calc( 100% - 18px ); - padding: 9px; - .wp-caption-text { - margin-bottom: 0.6em; - padding: 10px 0 5px 40px; - position: relative; - } - .wp-caption-text, .gallery-caption { - color: #666; - font-size: 12px; - } - } */ - table, tr, td { - border: 1px solid black; - padding: 5px; - } figure { margin: 16px 40px; } @@ -185,6 +182,17 @@ .wp-block-pullquote{ border-top: 1px solid #cbcbcb; border-bottom: 1px solid #cbcbcb; + p { + color: #298596; + font: { + size: 22px; + weight: 500; + } + } + cite { + font-size: 16px; + color: #898d8f; + } } .wp-caption, .gallery-caption { font-size: 13px;