Merge pull request #20 from smartcatdev/feb-2018-fixes

Feb 2018 Fixes - Updates to be released as v1.1.2
smartcatdev · Feb 5, 2018 · 001cea0 · 001cea0
2 parents fac43e3 + 4ca1a40
commit 001cea0
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 20 deletions.
diff --git a/front-page.php b/front-page.php
@@ -73,13 +73,23 @@
                                     <?php echo $front == 'posts' ? '</div>' : ''; ?>
 
                                     <?php if ($front == 'posts') : ?>
-                                        <div class="col-sm-4">
-                                            <div>
-                                                <div class="pagination-links"> 
-                                                    <?php echo paginate_links(); ?>
+
+                                        <?php $paginate_links = paginate_links( array(
+                                            'total' => $wp_query->max_num_pages,
+                                        ) ); ?>
+
+                                        <?php if ( $paginate_links ) : ?>
+
+                                            <div class="col-sm-4">
+                                                <div>
+                                                    <div class="pagination-links"> 
+                                                        <?php echo $paginate_links; ?>
+                                                    </div>
                                                 </div>
                                             </div>
-                                        </div>
+
+                                        <?php endif; ?>
+
                                     <?php endif; ?>
 
                                 <?php else : ?>

diff --git a/functions.php b/functions.php
@@ -18,7 +18,7 @@
 function relia_setup() {
 
         if( !defined( 'RELIA_VERSION' ) ) :
-            define('RELIA_VERSION', '1.1.1');
+            define('RELIA_VERSION', '1.1.2');
         endif;
 
 	/*

diff --git a/header.php b/header.php
@@ -55,7 +55,7 @@ class="header-logo wow fadeIn <?php echo get_theme_mod( 'relia_logo_or_title', '
                                 <?php if( class_exists( 'WooCommerce' ) && get_theme_mod( 'relia_shopping_cart_toggle', 'show') == 'show' ) : ?>
 
                                     <?php if( WC()->cart->get_cart_contents_count() > 0 ) : ?>
-                                        <a class="relia-cart" href="<?php echo wc_get_cart_url() ; ?>">
+                                        <a class="relia-cart" href="<?php echo function_exists( 'wc_get_cart_url' ) ? wc_get_cart_url() : WC()->cart->get_cart_url(); ?>">
                                             <span class="cart-total"><?php _e( 'Items in Cart', 'relia' ); ?> : </span>
                                             <?php echo WC()->cart->get_cart_contents_count(); ?>
                                         </a>
@@ -65,7 +65,7 @@ class="header-logo wow fadeIn <?php echo get_theme_mod( 'relia_logo_or_title', '
                                         <i class="fa fa-search"></i>
                                     <?php endif; ?>
 
-                                    <a href="<?php echo wc_get_cart_url() ; ?>">
+                                    <a href="<?php echo function_exists( 'wc_get_cart_url' ) ? wc_get_cart_url() : WC()->cart->get_cart_url(); ?>">
                                         <i class="fa fa-shopping-cart"></i>
                                     </a>
 

diff --git a/home.php b/home.php
@@ -90,6 +90,22 @@
                                 </div>
 
                             <?php endwhile; ?>
+
+                            <?php $paginate_links = paginate_links( array(
+                                'total' => $wp_query->max_num_pages,
+                            ) ); ?>
+
+                            <?php if ( $paginate_links ) : ?>
+
+                                <div class="col-sm-4">
+                                    <div>
+                                        <div class="pagination-links"> 
+                                            <?php echo $paginate_links; ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            <?php endif; ?>
 
                         <?php else : ?>
 

diff --git a/inc/css/style.css b/inc/css/style.css
@@ -523,8 +523,9 @@ div#slider-content-overlay h2 {
         /*padding-top: 100px !important;*/
     }
 
-    div.hero-overlay h2 {    
-        font-size: 24px !important;
+    body div.hero-overlay h2, 
+    body div#slider-content-overlay h2 {
+        font-size: 28px;
     }
 
     div.big-hero-buttons button {
@@ -989,14 +990,17 @@ div.homepage-page-content header {
     color: #fff;
 }
 
+div.blog-index-content .row .row > div.col-sm-4,
 div.homepage-page-content > div.col-sm-4 {
     padding: 0 7.5px;
 }
 
+div.blog-index-content .row .row > div.col-sm-4 > div,
 div.homepage-page-content > div.col-sm-4 > div {
     height: 300px;
 }
 
+body.blog div.pagination-links,
 div.homepage-page-content div.pagination-links {
     background-color: #1c1c1c;
     color: #d9d9d9;
@@ -1010,17 +1014,21 @@ div.homepage-page-content div.pagination-links {
     text-align: center;
 }
 
+body.blog div.pagination-links span,
+body.blog div.pagination-links a,
 div.homepage-page-content div.pagination-links span,
 div.homepage-page-content div.pagination-links a {
     text-decoration: none;
     margin-left: 5px;
 }
 
-
+body.blog div.pagination-links a:hover,
 div.homepage-page-content div.pagination-links a:hover {
     color: #fff;
 }
 
+body.blog div.pagination-links a.next,
+body.blog div.pagination-links a.prev,
 div.homepage-page-content div.pagination-links a.next,
 div.homepage-page-content div.pagination-links a.prev {
 /*    display: block;*/
@@ -2125,4 +2133,12 @@ ul#relia-testimonials .testimonial-author {
 
 .search article span.comments-link {
     margin-right: 10px;
+}
+
+/* ----- WooCommerce Updates ----- */
+ul.products mark.count {
+    display: none;
+}
+body.woocommerce ul.products li.product a h2.woocommerce-loop-category__title {
+    margin-bottom: 1em;
 }
diff --git a/inc/css/temps/blue.css b/inc/css/temps/blue.css
@@ -104,7 +104,8 @@ div.homepage-page-content > div.col-sm-4 > div,
 kbd, 
 code, 
 pre, 
-tt {
+tt,
+div.blog-index-content .row .row > div.col-sm-4 > div {
     border: thin solid #1f8aa5;
 }
 

diff --git a/inc/css/temps/gold.css b/inc/css/temps/gold.css
@@ -104,7 +104,8 @@ div.homepage-page-content > div.col-sm-4 > div,
 kbd, 
 code, 
 pre, 
-tt {
+tt,
+div.blog-index-content .row .row > div.col-sm-4 > div {
     border: thin solid #ca6;
 }
 

diff --git a/inc/css/temps/green.css b/inc/css/temps/green.css
@@ -104,7 +104,8 @@ div.homepage-page-content > div.col-sm-4 > div,
 kbd, 
 code, 
 pre, 
-tt {
+tt,
+div.blog-index-content .row .row > div.col-sm-4 > div {
     border: thin solid #8fc464;
 }
 

diff --git a/inc/css/temps/purple.css b/inc/css/temps/purple.css
@@ -104,7 +104,8 @@ div.homepage-page-content > div.col-sm-4 > div,
 kbd, 
 code, 
 pre, 
-tt {
+tt,
+div.blog-index-content .row .row > div.col-sm-4 > div {
     border: thin solid #9f6eea;
 }
 

diff --git a/inc/css/temps/red.css b/inc/css/temps/red.css
@@ -104,7 +104,8 @@ div.homepage-page-content > div.col-sm-4 > div,
 kbd, 
 code, 
 pre, 
-tt {
+tt,
+div.blog-index-content .row .row > div.col-sm-4 > div {
     border: thin solid #c93838;
 }
 

diff --git a/inc/css/temps/teal.css b/inc/css/temps/teal.css
@@ -104,7 +104,8 @@ div.homepage-page-content > div.col-sm-4 > div,
 kbd, 
 code, 
 pre, 
-tt {
+tt,
+div.blog-index-content .row .row > div.col-sm-4 > div {
     border: thin solid #55d6b8;
 }
 

diff --git a/readme.txt b/readme.txt
@@ -4,8 +4,8 @@ Contributors: smartcat
 Tags: one-column, two-columns, three-columns, left-sidebar, right-sidebar, grid-layout, custom-colors, custom-menu, featured-images, theme-options, translation-ready, blog, e-commerce, entertainment, news, photography, portfolio
 
 Requires at least: 4.6
-Tested up to: 4.7.5
-Stable tag: 1.1.1
+Tested up to: 4.9.2
+Stable tag: 1.1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -75,6 +75,10 @@ relia includes support for Infinite Scroll in Jetpack, as well as Our Team Showc
 * Reinstate WooCommerce Gallery features by specifically adding declarations
 * WooCommerce fix for Cart URL
 
+= 1.1.2 - February 2 2018 =
+* Improved blog pagination and ensured it only shows when necessary
+* Fixed UI bug on WC shop pages that was displaying a count next to product categories
+* Added responsiveness font-size change to Jumbotron text on mobile devices
 
 == Credits ==
 

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://smartcatdesign.net/smartcat-products/relia-wordpress-theme/
 Author: Smartcat
 Author URI: https://smartcatdesign.net
 Description: Build your site easily and quickly. Relia is a pixel-perfect, professional, fully responsive, Parallax modern WordPress theme, built with care and attention to design. It is Woocommerce ready, multi-purpose theme with a design that can be used by a startup companies, businesses, creative agencies and online stores. Relia features a full width frontpage Jumbotron, animated callouts with over 600 icons to choose from. The blog is an attractive tile grid, it comes with multiple color skin options, left and right sidebars, 4 widget areas, mobile responsive menu and links to your social media sites. Relia allows you to fully customize your site without having to work with code. Relia also features a live customizer, allowing you to test settings and preview them as you go. Create your first page, set the frontpage template and let Relia take care of the rest!
-Version: 1.1.1
+Version: 1.1.2
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: relia
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,7 +104,8 @@ div.homepage-page-content > div.col-sm-4 > div, @@
     kbd,
     code,
     pre,
-    tt {
+    tt,
+    div.blog-index-content .row .row > div.col-sm-4 > div {
         border: thin solid #1f8aa5;
     }
@@ Expand Down @@