Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

2c1ed5f8

Commit 2c1ed5f8 authored 7 years ago by Akihiko Odaki Committed by Eugen Rochko 7 years ago

Downloads
- Patches
- Plain Diff

Show mastodon on modal (#6129)

parent 7d376e41

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/authorize_follows_controller.rb 5 additions, 0 deletions

app/controllers/authorize_follows_controller.rb
app/controllers/remote_follow_controller.rb 4 additions, 0 deletions

app/controllers/remote_follow_controller.rb
app/controllers/shares_controller.rb 1 addition, 1 deletion

app/controllers/shares_controller.rb
app/javascript/images/mastodon-ui.png 0 additions, 0 deletions

app/javascript/images/mastodon-ui.png
app/javascript/images/wave-compose-standalone.png 0 additions, 0 deletions

app/javascript/images/wave-compose-standalone.png
app/javascript/images/wave-modal.png 0 additions, 0 deletions

app/javascript/images/wave-modal.png
app/javascript/styles/application.scss 1 addition, 0 deletions

app/javascript/styles/application.scss
app/javascript/styles/mastodon/components.scss 1 addition, 1 deletion

app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss 20 additions, 0 deletions

app/javascript/styles/mastodon/modal.scss
app/views/layouts/modal.html.haml 2 additions, 0 deletions

app/views/layouts/modal.html.haml

with 34 additions and 2 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