-
Notifications
You must be signed in to change notification settings - Fork 195
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix custom styles for emails in preview and in sent messages #7595
Open
merkushin
wants to merge
8
commits into
trunk
Choose a base branch
from
fix/email-styles
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ce2fb46
Fix custom styles for emails in preview and in sent messages
merkushin be0c332
Merge branch 'trunk' into fix/email-styles
Imran92 2a2ec4e
Disable default colors in the editor for emails
merkushin b8a6aab
Add styles for text and buttons alignment
merkushin c4995fc
Merge branch 'trunk' into fix/email-styles
merkushin e9024b1
Disable alignment for buttons and images, fix padding for buttons and…
merkushin 26dff80
Merge branch 'trunk' into fix/email-styles
merkushin ff3f7c1
Set 100% height for an image to avoid stretching of wide images
merkushin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
Significance: patch | ||
Type: fixed | ||
|
||
Fix custom styles for emails in preview and in sent messages |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -229,17 +229,17 @@ public function get_email_body( WP_Post $email_post, array $placeholders = [] ): | |
* | ||
* @internal | ||
* | ||
* @param string $string The string. | ||
* @param string $content Content to replace the placeholders in. | ||
* @param array $placeholders The placeholders. | ||
* | ||
* @return string | ||
*/ | ||
private function replace_placeholders( string $string, array $placeholders ): string { | ||
private function replace_placeholders( string $content, array $placeholders ): string { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. PHPCS was complaining for the variable name. |
||
foreach ( $placeholders as $placeholder => $value ) { | ||
$string = str_replace( '[' . $placeholder . ']', $value, $string ); | ||
$content = str_replace( '[' . $placeholder . ']', $value, $content ); | ||
} | ||
|
||
return $string; | ||
return $content; | ||
} | ||
|
||
/** | ||
|
@@ -250,14 +250,15 @@ private function replace_placeholders( string $string, array $placeholders ): st | |
* @return string | ||
*/ | ||
private function load_email_styles(): string { | ||
$css_dist_path = Sensei()->assets->dist_path( 'css/email-notifications/email-style.css' ); | ||
$styles = wp_get_global_stylesheet(); | ||
|
||
$css_dist_path = Sensei()->assets->dist_path( 'css/email-notifications/email-style.css' ); | ||
if ( file_exists( $css_dist_path ) ) { | ||
// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents -- Local file usage. | ||
return file_get_contents( $css_dist_path ); | ||
$styles .= file_get_contents( $css_dist_path ); | ||
} | ||
|
||
return ''; | ||
return $styles; | ||
} | ||
|
||
/** | ||
|
@@ -322,7 +323,7 @@ private function add_base_url_for_images( $content ) { | |
* | ||
* @return array Headers. | ||
*/ | ||
private function get_email_headers():array { | ||
private function get_email_headers(): array { | ||
$settings = $this->settings->get_settings(); | ||
$headers = [ | ||
'Content-Type: text/html; charset=UTF-8', | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if it makes a difference but probably
height: auto
is more correct. WDYT?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, Miro, I'll try it.