#2711 code improved

ahmedkaludi · Apr 2, 2019 · 743c5d8 · MohammedKaludi · Apr 10, 2019 · pegazee
1 parent 100a42d
commit 743c5d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pagebuilder/inc/viewShowFrontData.php b/pagebuilder/inc/viewShowFrontData.php
@@ -492,11 +492,13 @@ function amp_pagebuilder_content_styles(){
 	echo amppb_validateCss($completeCssOfPB);
 } 
 function amppb_validateCss($css){
+	$css = str_replace('&quot;', '"', $css);
 	$css = str_replace(array('.amppb-fluid','.amppb-fixed'), array('.ap-fl','.ap-fi'), $css);
 	$css = preg_replace('/(([a-z -]*:(\s)*;))/', "", $css);
 	$css = preg_replace('/((;[\s\n;]*;))/', ";", $css);
 	$css = preg_replace('/(?:[^\r\n,{}]+)(?:,(?=[^}]*{,)|\s*{[\s]*})/', "", $css);
-
+	$css = preg_replace('/\s\n+/', "", $css);
+
 	return ampforwp_pb_autoCompileLess($css);
 }
 

diff --git a/templates/design-manager/swift/style.php b/templates/design-manager/swift/style.php
@@ -426,7 +426,7 @@
 <?php if($redux_builder_amp['single-design-type'] == '1' || $redux_builder_amp['single-design-type'] == '4'){?>
 <?php // Single
 
-if(is_single() ) { ?>
+if(is_single() && !checkAMPforPageBuilderStatus(get_the_ID())) { ?>
 .cntn-wrp{
 <?php
  $fontFamily = "font-family: 'Arial, Helvetica, sans-serif'";