Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

bc5678d0

Unverified Commit bc5678d0 authored 5 years ago by Eugen Rochko Committed by GitHub 5 years ago

Downloads
- Patches
- Plain Diff

Change conversations UI (#11896)

Fix #11414, fix #9860, fix #10434

parent 33b2e0f1

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/javascript/mastodon/actions/conversations.js 28 additions, 0 deletions

app/javascript/mastodon/actions/conversations.js
app/javascript/mastodon/components/avatar_composite.js 17 additions, 11 deletions

app/javascript/mastodon/components/avatar_composite.js
app/javascript/mastodon/containers/status_container.js 1 addition, 0 deletions

app/javascript/mastodon/containers/status_container.js
app/javascript/mastodon/features/direct_timeline/components/conversation.js 113 additions, 15 deletions

...todon/features/direct_timeline/components/conversation.js
app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js 65 additions, 10 deletions

...ures/direct_timeline/containers/conversation_container.js
app/javascript/styles/mastodon/components.scss 56 additions, 33 deletions

app/javascript/styles/mastodon/components.scss

with 280 additions and 69 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment