fixing style merge conflicts #11897
Merged
fixing style merge conflicts #11897
Conversation
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
dreamofabear
approved these changes
Nov 2, 2017
| width: 56px; | ||
| height: 56px; | ||
| width: 56px!important; | ||
| height: 56px!important; |
There was a problem hiding this comment.
Nit: Looks like use of space before !important is inconsistent.
There was a problem hiding this comment.
i dont really see any space before !important in the rest of the file... is it a required thing?
There was a problem hiding this comment.
The rest of AMP code prefixes with a single space. Not critical but please fix moving forward.
dvoytenko
pushed a commit
that referenced
this pull request
Nov 3, 2017
neko-fire
pushed a commit
to 3qnexx/amphtml
that referenced
this pull request
Nov 17, 2017
gzgogo
pushed a commit
to gzgogo/amphtml
that referenced
this pull request
Jan 26, 2018
thekorn
pushed a commit
to edelight/amphtml
that referenced
this pull request
Sep 11, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#11832 caused some merge conflicts and setStyles need to convert to setImportantStyles
This PR fixes it.
cc: @alanorozco @newmuis @choumx