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

Fixed moderation-button-position when viewing reshare #5601

Merged

Conversation

@Faldrian
Copy link
Contributor

commented Jan 28, 2015

Fix for #5591
I placed the icons left to the post-time because they kind of belong to the metadata of the reshare and I didn't want three rows next to the avatar, making the reshare-info take up more space.

bildschirmfoto - 28 01 2015 - 14 18 17

@goobertron

This comment has been minimized.

Copy link

commented Jan 28, 2015

they kind of belong to the metadata of the reshare

Yes - well spotted!

@Flaburgan

This comment has been minimized.

Copy link
Member

commented Jan 28, 2015

Just tested this with Firefox 37 and there is a display problem:

capture du 2015-01-28 17 23 26

It only appears on your reshares though.

@Faldrian

This comment has been minimized.

Copy link
Contributor Author

commented Jan 28, 2015

@Flaburgan Are you sure you have cleared all your caches before? I can't reproduce.
bildschirmfoto - 28 01 2015 - 17 43 47

@Flaburgan

This comment has been minimized.

Copy link
Member

commented Jan 31, 2015

I do not have the problem now you're right. This can be merged.

@@ -58,7 +58,9 @@
{{/if}}
<div class='status-message-location' />
</div>
{{#unless root}}
<div id='single-post-moderation' />

This comment has been minimized.

Copy link
@jaywink

jaywink Feb 1, 2015

Contributor

Looks good except maybe indendation fix? Tnx, can merge after that :)

This comment has been minimized.

Copy link
@Faldrian

Faldrian Feb 2, 2015

Author Contributor

fixed

@jaywink jaywink added this to the next-major milestone Feb 1, 2015

@Faldrian Faldrian force-pushed the Faldrian:5591-correct-moderation-placement-reshare branch from 04625ad to db6464e Feb 2, 2015

@Faldrian

This comment has been minimized.

Copy link
Contributor Author

commented Feb 5, 2015

@jaywink fixed that: #5601 (comment) :)

@jaywink

This comment has been minimized.

Copy link
Contributor

commented Feb 5, 2015

Yeah sorry, forgot this :P Tried to get travis random failure to pass a few times but it's persisting on failing this time, sigh... So mergy merge, thanks for the fix! :)

jaywink added a commit that referenced this pull request Feb 5, 2015

Merge pull request #5601 from Faldrian/5591-correct-moderation-placem…
…ent-reshare

Fixed moderation-button-position when viewing reshare

@jaywink jaywink merged commit 28ff7fb into diaspora:develop Feb 5, 2015

1 check failed

continuous-integration/travis-ci The Travis CI build failed
Details
@Faldrian

This comment has been minimized.

Copy link
Contributor Author

commented Feb 5, 2015

Thx ;) Thought as much... ^^

@Faldrian Faldrian deleted the Faldrian:5591-correct-moderation-placement-reshare branch Feb 5, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.