Merge branch 'development' into fix/color-styles-updates

Codeinwp · Oct 25, 2023 · 2a567b3 · 2a567b3
2 parents 693c20a + 1696de8
commit 2a567b3
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 29 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/inc/Admin.php b/inc/Admin.php
@@ -13,6 +13,15 @@
  * Admin class.
  */
 class Admin {
+
+	/**
+	 * Property to suspend the survey.
+	 * Change it to true to enable it.
+	 *
+	 * @var bool
+	 */
+	private $suspend_survey = true;
+
 	/**
 	 * Admin constructor.
 	 */
@@ -55,6 +64,10 @@ public function setup_otter_notice() {
 	 */
 	public function should_show_survey_notice() {
 
+		if ( $this->suspend_survey ) {
+			return false;
+		}
+
 		// Notice was dismissed.
 		if ( get_option( Constants::CACHE_KEYS['dismissed-survey-notice'], 'no' ) === 'yes' ) {
 			return false;

diff --git a/inc/patterns/layout/columns-testimonials.php b/inc/patterns/layout/columns-testimonials.php
@@ -23,8 +23,8 @@
 	'categories' => array( 'neve-fse' ),
 	'keywords'   => array( 'Columns', 'testimonial', 'client', 'review' ),
 	'content'    => '
-<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"64px","bottom":"64px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"40px"}},"layout":{"inherit":true,"type":"constrained"}} -->
-<div class="wp-block-group alignfull" style="margin-top:0px;margin-bottom:0px;padding-top:64px;padding-bottom:64px">
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"64px","bottom":"64px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"40px"}},"backgroundColor":"ti-accent","textColor":"ti-fg-alt","layout":{"inherit":true,"type":"constrained"}} -->
+<div class="wp-block-group alignfull has-ti-fg-alt-color has-ti-accent-background-color has-text-color has-background" style="margin-top:0px;margin-bottom:0px;padding-top:64px;padding-bottom:64px">
     <!-- wp:group {"align":"wide"} -->
     <div class="wp-block-group alignwide">
         <!-- wp:columns {"style":{"spacing":{"blockGap":{"top":"24px","left":"24px"}}}} -->
@@ -44,7 +44,7 @@
                     <!-- /wp:paragraph -->
 
                     <!-- wp:paragraph {"align":"left","fontSize":"small"} -->
-                    <p class="has-text-align-left has-small-font-size"><strong>JOHN DOE</strong></p>
+                    <p class="has-text-align-left has-small-font-size"><strong>JANE DOE</strong></p>
                     <!-- /wp:paragraph -->
                 </div>
                 <!-- /wp:group -->
@@ -66,7 +66,7 @@
                     <!-- /wp:paragraph -->
 
                     <!-- wp:paragraph {"align":"left","fontSize":"small"} -->
-                    <p class="has-text-align-left has-small-font-size"><strong>JANE DOE</strong></p>
+                    <p class="has-text-align-left has-small-font-size"><strong>JOHN DOE</strong></p>
                     <!-- /wp:paragraph -->
                 </div>
                 <!-- /wp:group -->
@@ -88,7 +88,7 @@
                     <!-- /wp:paragraph -->
 
                     <!-- wp:paragraph {"align":"left","fontSize":"small"} -->
-                    <p class="has-text-align-left has-small-font-size"><strong>GEORGE DOE</strong></p>
+                    <p class="has-text-align-left has-small-font-size"><strong>MARIA DOE</strong></p>
                     <!-- /wp:paragraph -->
                 </div>
                 <!-- /wp:group -->

diff --git a/inc/patterns/layout/portfolio-columns.php b/inc/patterns/layout/portfolio-columns.php
@@ -22,8 +22,8 @@
 	'categories' => array( 'neve-fse' ),
 	'keywords'   => array( 'Columns', 'portfolio', 'cover' ),
 	'content'    => '
-<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"64px","bottom":"64px"},"margin":{"top":"0","bottom":"0"}}},"backgroundColor":"ti-fg-alt","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-ti-fg-alt-background-color has-background" style="margin-top:0;margin-bottom:0;padding-top:64px;padding-bottom:64px">
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"64px","bottom":"64px"},"margin":{"top":"0","bottom":"0"}}},"backgroundColor":"ti-bg","layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull has-ti-bg-background-color has-background" style="margin-top:0;margin-bottom:0;padding-top:64px;padding-bottom:64px">
     <!-- wp:heading {"textAlign":"left","align":"wide"} -->
     <h2 class="wp-block-heading alignwide has-text-align-left">Featured Work</h2>
     <!-- /wp:heading -->

diff --git a/templates/404.html b/templates/404.html
@@ -1,3 +1,5 @@
+<!-- wp:template-part {"slug":"header","theme":"neve-fse","tagName":"header"} /-->
+
 <!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"},"blockGap":"0","margin":{"top":"0","bottom":"0"}}}} -->
 <main class="wp-block-group" style="margin-top:0;margin-bottom:0;padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:cover {"overlayColor":"ti-bg-inv","minHeight":100,"minHeightUnit":"vh","align":"full"} -->
     <div class="wp-block-cover alignfull" style="min-height:100vh"><span aria-hidden="true" class="wp-block-cover__background has-ti-bg-inv-background-color has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:group {"style":{"spacing":{"padding":{"top":"64px","bottom":"64px"},"blockGap":"40px"}},"textColor":"ti-bg","layout":{"type":"constrained"}} -->
@@ -17,4 +19,6 @@ <h2 class="wp-block-heading has-text-align-center has-huge-font-size">404 - Page
             <!-- /wp:buttons --></div>
         <!-- /wp:group --></div></div>
     <!-- /wp:cover --></main>
-<!-- /wp:group -->
+<!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer","theme":"neve-fse","tagName":"footer"} /-->