diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-29 21:46:05 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-29 21:46:05 +0200 |
| commit | 9027bfff0c25a6da1bcef7ce880e5d8211062d1d (patch) | |
| tree | 4ef39c06c58453085c167a644029647ed72252a9 /app/javascript/mastodon/reducers/index.js | |
| parent | 5f69eb89e215fe7dc02cd0dc3f39b13f1945e88b (diff) | |
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
Diffstat (limited to 'app/javascript/mastodon/reducers/index.js')
| -rw-r--r-- | app/javascript/mastodon/reducers/index.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js index 0f4b209d4..b8d608888 100644 --- a/app/javascript/mastodon/reducers/index.js +++ b/app/javascript/mastodon/reducers/index.js @@ -15,6 +15,7 @@ import settings from './settings'; import push_notifications from './push_notifications'; import status_lists from './status_lists'; import mutes from './mutes'; +import blocks from './blocks'; import reports from './reports'; import contexts from './contexts'; import compose from './compose'; @@ -51,6 +52,7 @@ const reducers = { settings, push_notifications, mutes, + blocks, reports, contexts, compose, |