Skip to content

Upstream/develop#2

Merged
jwgoh merged 76 commits intomasterfrom
upstream/develop
May 2, 2018
Merged

Upstream/develop#2
jwgoh merged 76 commits intomasterfrom
upstream/develop

Conversation

@jwgoh
Copy link

@jwgoh jwgoh commented Mar 21, 2018

PR #1 cause   to be wrongly converted (see issue here), this PR pulls in more upstream changes that includes the fix for this

Brandon Arnold and others added 30 commits January 11, 2016 10:13
Fixed appending of classes to both <spacer> elements when size-sm & size-lg attributes are present.
…key` a variable, switch align and class for menu item
…into attributes

Conflicts:
	lib/componentFactory.js
Allow contextual sizes for Spacer
…key` a variable, switch align and class for menu item
devender2 and others added 20 commits July 1, 2016 17:24
This would be useful if we are adding attributes that help us to integrate the HTML with some WYSIWYG (as Mailchimp with mc:edit). Most of the existing components already include the attributes, but not the button.
This should fix the test failing for a given spacer that might contain both arguments size (size-lg and size-sm) as we display twice the space with the helper class to show or display depends on the media queries.
Allow to add attributes to buttons and spacers
Remove data-parsed attributes from html output
The character &#xA0; is being rendered as a space on Apple Mail's
preview (tested on 9 and 10). Switching it to a regular &nbsp; seems
to sort the issue.

foundation#69
Fix foundation#69
…space

Switch <spacer>'s non-breaking spaces from &#xA0; to &nbsp;
@jwgoh jwgoh self-assigned this Mar 21, 2018
@jwgoh jwgoh force-pushed the upstream/develop branch from c955cd2 to b34cf19 Compare March 21, 2018 04:41
@jwgoh jwgoh mentioned this pull request Mar 21, 2018
@jwgoh
Copy link
Author

jwgoh commented Mar 21, 2018

Will run nugit-mailgenerator with this specific branch and see how it goes. Any problem we can quickly revert back to master branch. https://github.com/nugit/nugit-mailgenerator/pull/140

@jwgoh jwgoh merged commit b34cf19 into master May 2, 2018
@jwgoh jwgoh deleted the upstream/develop branch May 2, 2018 07:48
@jwgoh jwgoh restored the upstream/develop branch May 2, 2018 07:50
@jwgoh jwgoh deleted the upstream/develop branch May 3, 2018 09:04
@jwgoh
Copy link
Author

jwgoh commented May 3, 2018

nugit/inky#upstream/develop branch is no longer referenced by nugit-mailgenerator, so can be deleted now
https://github.com/nugit/nugit-mailgenerator/pull/159
https://github.com/nugit/nugit-mailgenerator/pull/160

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants