Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.
This commit is contained in:
@ -3922,7 +3922,8 @@ a.status-card.compact:hover {
|
||||
}
|
||||
|
||||
&__multi-value__label,
|
||||
&__input {
|
||||
&__input,
|
||||
&__input-container {
|
||||
color: $darker-text-color;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user