diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-12-22 20:02:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 20:02:09 +0100 |
| commit | 3c033c4352f8b156887cd7157b4a89c23a545838 (patch) | |
| tree | fa6317223a0104abea84a10e6234a0beef316001 /app/javascript | |
| parent | 00862dcaff7cb918d29947accda1c01873a7ddeb (diff) | |
Add moderation warnings (#9519)
* Add moderation warnings Replace individual routes for disabling, silencing, and suspending a user, as well as the report update route, with a unified account action controller that allows you to select an action (none, disable, silence, suspend) as well as whether it should generate an e-mail notification with optional custom text. That notification, with the optional custom text, is saved as a warning. Additionally, there are warning presets you can configure to save time when performing the above. * Use Account#local_username_and_domain
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/images/icon_flag.svg | 4 | ||||
| -rw-r--r-- | app/javascript/images/mailer/icon_warning.png | bin | 0 -> 371 bytes | |||
| -rw-r--r-- | app/javascript/styles/mailer.scss | 4 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 4 |
4 files changed, 12 insertions, 0 deletions
diff --git a/app/javascript/images/icon_flag.svg b/app/javascript/images/icon_flag.svg new file mode 100644 index 000000000..3939c9d2b --- /dev/null +++ b/app/javascript/images/icon_flag.svg @@ -0,0 +1,4 @@ +<svg fill="#FFFFFF" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"> + <path d="M0 0h24v24H0z" fill="none"/> + <path d="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6z"/> +</svg> diff --git a/app/javascript/images/mailer/icon_warning.png b/app/javascript/images/mailer/icon_warning.png new file mode 100644 index 000000000..7baaac61c --- /dev/null +++ b/app/javascript/images/mailer/icon_warning.png Binary files differdiff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss index d83bd4d96..74d1df8ed 100644 --- a/app/javascript/styles/mailer.scss +++ b/app/javascript/styles/mailer.scss @@ -426,6 +426,10 @@ h5 { background: $success-green; } + &.alert-icon td { + background: $error-red; + } + img { max-width: 32px; width: 32px; diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index b6c771abf..e8f331932 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -542,6 +542,10 @@ a.name-tag, border-left-color: lighten($error-red, 12%); } + &.warning { + border-left-color: $gold-star; + } + &__bubble { padding: 16px; padding-left: 14px; |
