diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
| commit | 93912f04988eab072a119a588342c68c5cdb52e0 (patch) | |
| tree | 815a69053ed9f1eb5e86e62735220a53bfcef814 /app/javascript/styles/mastodon-light/diff.scss | |
| parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
| parent | d26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
Diffstat (limited to 'app/javascript/styles/mastodon-light/diff.scss')
| -rw-r--r-- | app/javascript/styles/mastodon-light/diff.scss | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index 1214d2519..928af8453 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -203,7 +203,8 @@ html { // Change the colors used in compose-form .compose-form { .compose-form__modifiers { - .compose-form__upload__actions .icon-button { + .compose-form__upload__actions .icon-button, + .compose-form__upload__warning .icon-button { color: lighten($white, 7%); &:active, @@ -212,14 +213,6 @@ html { color: $white; } } - - .compose-form__upload-description input { - color: lighten($white, 7%); - - &::placeholder { - color: lighten($white, 7%); - } - } } .compose-form__buttons-wrapper { |