Skip to content
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

Use placeholder for unsubscribe link and place it near the normal email footer content. #13421

Merged
merged 5 commits into from Oct 3, 2018

Conversation

diosmosis
Copy link
Member

Fixes #13330

@sgiehl can you review?

Here's what it looks like:

image

w/ WhiteLabel enabled:

image

@diosmosis diosmosis added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Sep 13, 2018
@diosmosis diosmosis added this to the 3.6.1 milestone Sep 13, 2018
@diosmosis
Copy link
Member Author

Fixed the issue making the unsubscribe link not underlined, here's what it looks like now:

image

@sgiehl
Copy link
Member

sgiehl commented Oct 1, 2018

@diosmosis could you do a rebase?

@diosmosis
Copy link
Member Author

@sgiehl Rebased.

Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides the little comment, looks good and works (also with Whitelabel)

@@ -1,16 +1,26 @@
{% set fontStyle %}color:{{ themeStyles.colorText|e('html_attr') }};font-family:{{ themeStyles.fontFamilyBase|e('html_attr') }};{% endset %}
c{% set styleParagraph = 'font-size:15px;line-height:24px;margin:0 0 16px;' %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a c in front of that line that should be removed again

@diosmosis diosmosis merged commit e6de421 into 3.x-dev Oct 3, 2018
@diosmosis diosmosis deleted the 13330-unsubscribe-styles branch October 3, 2018 19:58
InfinityVoid pushed a commit to InfinityVoid/matomo that referenced this pull request Oct 11, 2018
…il footer content. (matomo-org#13421)

* Use placeholder for unsubscribe link and place it near the normal email footer content.

* padding tweak for whitelabel

* fix unsubscribe link escaping replace issue

* Move _htmlReportFooter contents to _htmlEmailFooter.twig.

* Remove stray 'c'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants