Merge SCSS in a single components.scss file

[ClearlyClaire]

Doing this pains me, but one of the worst part of porting upstream changes is dealing with components.scss changes, as the contents are scattered across multiple files.

[ClearlyClaire]

I thought this would be relatively simple, but class definitions really have moved around a bunch… this is going to be a pain either way… and mastodon#28119 has 1200 line changes in components.scss 😩

[ClearlyClaire]

I again spent many hours on this, and there are still many more hours to spend. I'm still not sure this is a good solution, considering the whole “monolithic SCSS” mess is awful, but the upshots are:

• it helps identifying actual differences between glitch-soc and upstream and in particular helps uncovering unintended discrepancies
• while I'm doing this, I'm finding dead code in both glitch-soc and upstream
• once it's done, it should make following upstream much easier

Still, it's a lot of work, and I'm afraid this will also push a large amount of work on downstreams. cc @kescherCode @TheEssem

[kescherCode]

Well, we can't exactly cheat our way out of the upstream merge work, can we ^^ What must be done, must be done.

[ClearlyClaire]

Making some progress. I basically reordered rules, refactored things a bit, applied some upstream changes that were somehow missed previously, removed some unintended duplicates as well as some dead code… and also introduced dead code that we removed but upstream was still holding on (though I have removed them upstream, so we'll get to that in a later merge.

There are still significant differences, but most of them are due to actual feature/design/markup changes, so I'm considering either keeping them or tackling them in follow-up PRs.

Broadly, the changes I can think of are:

• significantly different markup and layout for profiles: while I don't like everything in upstream's design, I think it's overall better-looking and more consistent than ours. I'm considering adopting it and working from there
• a few glitch-soc small features that I'm not sure are worth keeping (e.g. the “sensitive” label on media attachments that are being shown)
• significantly different markup and layout for statuses and composer