]> cat aescling's git repositories - mastodon.git/commit
Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)
authorThibG <thib@sitedethib.com>
Sun, 29 Sep 2019 19:46:05 +0000 (21:46 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Sun, 29 Sep 2019 19:46:05 +0000 (21:46 +0200)
commit9027bfff0c25a6da1bcef7ce880e5d8211062d1d
tree4ef39c06c58453085c167a644029647ed72252a9
parent5f69eb89e215fe7dc02cd0dc3f39b13f1945e88b
Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)

* Add some explanation to the mute modal dialog

* Remove `isSubmitting` from mute modal code, this wasn't used

* Refactor block modal

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
* Refactor SCSS a bit

* Put mute modal toggle to the same side as in the report dialog for consistency

* Reword mute explanation

* Fix mute explanation styling

* Left-align all text in mute confirmation modal
14 files changed:
app/javascript/mastodon/actions/blocks.js
app/javascript/mastodon/containers/status_container.js
app/javascript/mastodon/features/account_timeline/containers/header_container.js
app/javascript/mastodon/features/status/containers/detailed_status_container.js
app/javascript/mastodon/features/status/index.js
app/javascript/mastodon/features/ui/components/block_modal.js [new file with mode: 0644]
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/mute_modal.js
app/javascript/mastodon/features/ui/util/async-components.js
app/javascript/mastodon/reducers/blocks.js [new file with mode: 0644]
app/javascript/mastodon/reducers/index.js
app/javascript/mastodon/reducers/mutes.js
app/javascript/styles/mastodon-light/diff.scss
app/javascript/styles/mastodon/components.scss