Merge branch 'develop'

assets/css/main.css

@@ -12,7 +12,7 @@
 # Alignments
 # Clearings
 # Display
-# Site title
+# Page title
 	## Breadcrumb
 # Widgets
 	## General
@@ -713,13 +713,20 @@ a:hover, a:active {
 }
 
 /*--------------------------------------------------------------
-# Site title
+# Page title
 --------------------------------------------------------------*/
 #outerafterheader{
 	background-repeat:no-repeat;
 	background-size:cover;
 	background-position:center;
 }
+.page-title{
+	color:#000;
+	font-weight:400;
+	text-transform: uppercase;
+	margin:70px 0px;
+	font-size:3em;
+}
 .page-desc{
 	margin-bottom:2.1em;
 }
@@ -729,6 +736,7 @@ a:hover, a:active {
 #outerafterheader .woocommerce-breadcrumb{
 	margin:30px 0px 0px;
 }
+
 /*--------------------------------------------------------------
 # Widgets
 --------------------------------------------------------------*/
@@ -745,10 +753,13 @@ a:hover, a:active {
 }
 
 .widget-title {
-	font-size:1.3em;
-    font-weight: 400;
+	font-size:1.2em;
+    font-weight: 300;
     margin-bottom: 1em;
     line-height: 1.5;
+    letter-spacing: 2px;
+    text-transform: uppercase;
+    color:#999;
 }
 
 .widget ul {
@@ -922,8 +933,8 @@ body.ifs-content-full-width-no-padding #content-container > .row > .site-content
 
 article.post{
 	background-color:#fff;
-	border:1px solid rgba(0,0,0,0.1);
-	padding:5.34em 6.67em
+	border:0px;
+	padding:0px;
 }
 
 article.post a,
@@ -936,17 +947,26 @@ article.post .entry-title a:visited{
 	color:#333;
 }
 
+.hentry .entry-meta > *{
+	display:inline-block;
+	margin-right:1em;
+	font-family:serif;
+	font-style:italic;
+}
+
 .entry-footer span{
 	display:inline-block;
 	margin-right:1em;
+	font-family:serif;
+	font-style:italic;
 }
 
 /*--------------------------------------------------------------
 ## Singles
 --------------------------------------------------------------*/
 .single-main > .hentry{
 	background-color:#fff;
-	padding:5.34em 6.67em;
+	padding:0px;
 	margin-bottom:2em;
 }
 
@@ -956,7 +976,7 @@ article.post .entry-title a:visited{
 
 .single-main > .comments-area{
 	background-color:#fff;
-	padding:5.34em 6.67em;
+	padding:0;
 	margin-bottom:2em;
 }
 
@@ -969,6 +989,8 @@ article.post .entry-title a:visited{
 	margin-bottom:35px;
 	text-align:center;
 	font-size:1.2858rem;
+	font-family:serif;
+	font-style:italic;
 }
 
 .related-posts-container .content-related{
@@ -989,9 +1011,23 @@ article.post .entry-title a:visited{
 	line-height:1.7em;
 }
 
+.related-posts-container .content-related:after{
+	content:"";
+	display:block;
+	position:absolute;
+	bottom:0px;
+	left:15px;
+	right:15px;
+	height:1px;
+	background-color:#000;
+}
+
 /*--------------------------------------------------------------
 ## Comments
 --------------------------------------------------------------*/
+.comments-area .comments-title{
+	margin-bottom:30px;
+}
 .comment-list{
 	margin:0px;
 	padding:0px;
@@ -1006,8 +1042,20 @@ article.post .entry-title a:visited{
 	border-width:0px 0px 1px 0px;
 	border-style: solid;
 	border-color:#dedede;
-	padding:0 0 1.5em 0;
+	padding:0 0 1.5em 42px;
 	margin:0 0 1.5em 0;
+	position:relative;
+}
+
+.comment-list .comment-avatar{
+	display:inline-block;
+	border-radius:50%;
+	-moz-border-radius:50%;
+	-webkit-border-radius:50%;
+	overflow:hidden;
+	position:absolute;
+	left:0px;
+	top:0px;
 }
 
 .comment-list .comment-meta{
@@ -1022,6 +1070,11 @@ article.post .entry-title a:visited{
 	display: block;
 }
 
+.comment-list .children{
+	padding-left:0px;
+	margin-left:42px;
+}
+
 /*--------------------------------------------------------------
 # Infinite scroll
 --------------------------------------------------------------*/

comments.php

@@ -50,8 +50,9 @@
 		<ol class="comment-list">
 			<?php
 				wp_list_comments( array(
-					'style'      => 'ol',
-					'short_ping' => true,
+					'style'      	=> 'ol',
+					'short_ping' 	=> true,
+					'callback' 	=> 'ifs_legacy_list_comment'
 				) );
 			?>
 		</ol><!-- .comment-list -->

inc/theme-functions.php

@@ -399,6 +399,86 @@ function ifs_legacy_login_form() {
 	}
 }
 
+/**
+ * display comment list
+ *
+ */
+if( !function_exists( 'ifs_legacy_list_comment' ) ){
+
+	function ifs_legacy_list_comment($comment, $args, $depth) {
+
+	    if ( 'div' === $args['style'] ) {
+	        $tag       = 'div';
+	        $add_below = 'comment';
+	    } else {
+	        $tag       = 'li';
+	        $add_below = 'div-comment';
+	    }?>
+
+	    <<?php echo $tag; ?> <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?> id="comment-<?php comment_ID() ?>">
+
+		<?php if ( 'div' != $args['style'] ) { ?>
+
+	        	<div id="div-comment-<?php comment_ID() ?>" class="comment-body">
+
+		<?php } ?>
+
+	        <div class="comment-author vcard">
+			<?php if ( $args['avatar_size'] != 0 ) { ?>
+
+				<span class="comment-avatar">
+	                	<?php echo get_avatar( $comment, $args['avatar_size'] ); ?>
+	            </span> 
+
+			<?php }
+
+			printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link() ); 
+
+			?>
+	        </div>
+
+	        <?php if ( $comment->comment_approved == '0' ) { ?>
+
+	            <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></em><br/>
+
+		<?php } ?>
+
+	        <div class="comment-meta commentmetadata">
+
+	            <a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ); ?>"><?php
+	                /* translators: 1: date, 2: time */
+	                printf( 
+	                    __('%1$s at %2$s'), 
+	                    get_comment_date(),  
+	                    get_comment_time() 
+	                ); ?>
+	            </a>
+	            <?php edit_comment_link( __( '(Edit)' ), '  ', '' ); ?>
+
+	        </div>
+
+	        <?php comment_text(); ?>
+
+	        <div class="reply"><?php 
+	                comment_reply_link( 
+	                    array_merge( 
+	                        $args, 
+	                        array( 
+	                            'add_below' => $add_below, 
+	                            'depth'     => $depth, 
+	                            'max_depth' => $args['max_depth'] 
+	                        ) 
+	                    ) 
+	                ); ?>
+	        </div>
+
+	        <?php if ( 'div' != $args['style'] ) : ?>
+	        </div>
+	        <?php endif;
+	}
+}
+
+
 /**
  * display open container for related posts
  *

inc/theme-header.php

@@ -658,7 +658,7 @@ function ifs_legacy_get_the_header_desc(){
  * @uses ifs_legacy_get_the_header_desc()
  */
 function ifs_legacy_the_header_desc(){
-	if( ifs_legacy_get_the_header_desc() ){
+	if( ifs_legacy_get_the_header_desc() == '' ){
 		echo '';
 	}else{
 		echo '<div class="page-desc"><span>' . ifs_legacy_get_the_header_desc() . '</span></div>';

inc/theme-tags.php

@@ -12,6 +12,17 @@
 	 * Prints HTML with meta information for the current post-date/time and author.
 	 */
 	function ifs_legacy_posted_on() {
+
+		do_action( 'ifs_legacy_posted_on' );
+
+	}
+endif;
+
+if ( ! function_exists( 'ifs_legacy_print_posted_on' ) ) :
+	/**
+	 * Prints HTML with meta information for the current post-date/time and author.
+	 */
+	function ifs_legacy_print_posted_on() {
 		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
 		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
 			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
@@ -39,13 +50,25 @@ function ifs_legacy_posted_on() {
 		echo '<span class="posted-on">' . $posted_on . '</span><span class="byline"> ' . $byline . '</span>'; // WPCS: XSS OK.
 
 	}
+	add_action('ifs_legacy_posted_on', 'ifs_legacy_print_posted_on', 10);
 endif;
 
 if ( ! function_exists( 'ifs_legacy_entry_footer' ) ) :
 	/**
 	 * Prints HTML with meta information for the categories, tags and comments.
 	 */
 	function ifs_legacy_entry_footer() {
+
+		do_action( 'ifs_legacy_entry_footer' );
+
+	}
+endif;
+
+if ( ! function_exists( 'ifs_legacy_print_entry_footer' ) ) :
+	/**
+	 * Prints HTML with meta information for the categories, tags and comments.
+	 */
+	function ifs_legacy_print_entry_footer() {
 		// Hide category and tag text for pages.
 		if ( 'post' === get_post_type() ) {
 			/* translators: used between list items, there is a space after the comma */
@@ -99,4 +122,5 @@ function ifs_legacy_entry_footer() {
 			'</span>'
 		);
 	}
+	add_action('ifs_legacy_entry_footer', 'ifs_legacy_print_entry_footer', 10);
 endif;

style.css

@@ -4,7 +4,7 @@ Theme URI: http://underscores.me/
 Author: Novaro Studio
 Author URI: http://www.interfeis.com
 Description: The latest free theme from Interfeis team
-Version: 0.1.0
+Version: 0.1.5
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: ifs-legacy

template-parts/content-image.php

@@ -12,9 +12,7 @@
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
 		<?php
-		if ( is_singular() ) :
-			the_title( '<h1 class="entry-title">', '</h1>' );
-		else :
+		if ( !is_singular() ) :
 			the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
 		endif;
 

template-parts/content.php

@@ -12,16 +12,19 @@
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
 		<?php
-		if ( is_singular() ) :
-			the_title( '<h1 class="entry-title">', '</h1>' );
-		else :
+
+		if ( !is_singular() ) :
+
 			the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+
 		endif;
 
 		if ( 'post' === get_post_type() ) : ?>
-		<div class="entry-meta">
-			<?php ifs_legacy_posted_on(); ?>
-		</div><!-- .entry-meta -->
+
+			<div class="entry-meta">
+				<?php ifs_legacy_posted_on(); ?>
+			</div><!-- .entry-meta -->
+
 		<?php
 		endif; ?>
 	</header><!-- .entry-header -->