#2707 #2745 Added in master

ahmedkaludi · Feb 4, 2019 · e55cc26 · e55cc26
1 parent 8b56412
commit e55cc26
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/includes/vendor/amp/includes/sanitizers/class-amp-style-sanitizer.php b/includes/vendor/amp/includes/sanitizers/class-amp-style-sanitizer.php
@@ -25,15 +25,16 @@ private function collect_styles_recursive( $node ) {
 		if ( $node->hasAttributes() && $node instanceof DOMElement ) {
 			$style = $node->getAttribute( 'style' );
 			$class = $node->getAttribute( 'class' );
+			$tagName = $node->tagName;
 
 			if ( $style ) {
 				$style = $this->process_style( $style );
 				if ( ! empty( $style ) ) {
 					$class_name = $this->generate_class_name( $style );
 					$new_class  = trim( $class . ' ' . $class_name );
-
+					$selector = $tagName.'.' . $class_name;
 					$node->setAttribute( 'class', $new_class );
-					$this->styles[ '.' . $class_name ] = $style;
+					$this->styles[ $selector ] = $style;
 				}
 
 				$node->removeAttribute( 'style' );

diff --git a/includes/vendor/vendor-changelog.txt b/includes/vendor/vendor-changelog.txt
@@ -57,4 +57,5 @@ Reason: To extend the functionality of sidebars and Pagebuilder
 30. FTP protocol has been whitelisted in anchor tags #2477
 31. Class AMP_Img_Sanitizer Updated #2748
 32. Widgets folder added in Vendor amp/includes #1400 
-33. Class AMP_Blacklist_Sanitizer updated #2835
+33. Class AMP_Blacklist_Sanitizer updated #2835
+34. class-amp-style-sanitizer.php updated #2745
diff --git a/pagebuilder/modules/button-mod-module.php b/pagebuilder/modules/button-mod-module.php
@@ -69,6 +69,7 @@
 		 						'name'		=>"btn_link",		
 		 						'label'		=>'URL',
 		           				'tab'     =>'customizer',
+		           				'helpmessage'	=> esc_html__('Enter URL with Valid Protocol(http, https, mailto, sms, tel, viber, whatsapp, ftp)', 'accelerated-mobile-pages'),
 		 						'default'	=>'#',	
 		           				'content_type'=>'html',
 	 						),

diff --git a/templates/features.php b/templates/features.php
@@ -7782,4 +7782,12 @@ function ampforwp_sd_feature_image_guidlines($metadata){
 		}
 		return $metadata;
 	}
-}
+}
+// Gutenberg Modules CSS #2707
+add_action('amp_post_template_css', 'ampforwp_gutenberg_css');
+if ( ! function_exists('ampforwp_gutenberg_css') ) {
+	function ampforwp_gutenberg_css(){ ?>
+		.wp-block-button { color: #fff}
+		.wp-block-button a {background-color: #32373c;border-radius: 28px;color: inherit;display: inline-block;padding: 12px 24px;}
+	<?php }
+}