diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-18 16:37:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 16:37:27 +0200 |
| commit | e1066cd4319a220d5be16e51ffaf5236a2f6e866 (patch) | |
| tree | 3cac387721ffb3cefa66d96d1867ae88c9e249ce /app/javascript | |
| parent | d0c2c5278391b82ba7fa2f230bf237805ff61a0c (diff) | |
Add password challenge to 2FA settings, e-mail notifications (#11878)
Fix #3961
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 43 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/forms.scss | 4 |
2 files changed, 27 insertions, 20 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 5d4fe4ef8..074eee2cd 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -233,32 +233,35 @@ hr.spacer { height: 1px; } -.muted-hint { - color: $darker-text-color; +body, +.admin-wrapper .content { + .muted-hint { + color: $darker-text-color; - a { - color: $highlight-text-color; + a { + color: $highlight-text-color; + } } -} -.positive-hint { - color: $valid-value-color; - font-weight: 500; -} + .positive-hint { + color: $valid-value-color; + font-weight: 500; + } -.negative-hint { - color: $error-value-color; - font-weight: 500; -} + .negative-hint { + color: $error-value-color; + font-weight: 500; + } -.neutral-hint { - color: $dark-text-color; - font-weight: 500; -} + .neutral-hint { + color: $dark-text-color; + font-weight: 500; + } -.warning-hint { - color: $gold-star; - font-weight: 500; + .warning-hint { + color: $gold-star; + font-weight: 500; + } } .filters { diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index 16352340b..80ef8797d 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -254,6 +254,10 @@ code { &-6 { max-width: 50%; } + + .actions { + margin-top: 27px; + } } .fields-group:last-child, |