sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity

Merge commit '1cdcd9dc08' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
This commit is contained in:
Claire 2023-08-24 21:01:19 +02:00
commit fbfc4145fd
8 changed files with 369 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/javascript/styles/mastodon/forms.scss
View file

@ -309,9 +309,19 @@ code {
border-radius: 4px;
background: url('images/void.png');
&[src$='missing.png'] {
visibility: hidden;
}
&:last-child {
margin-bottom: 0;
}
&#account_avatar-preview {
width: 90px;
height: 90px;
object-fit: cover;
}
}
}