Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Our README is completely different.
  Discarded upstream changes.
This commit is contained in:
Claire
2022-11-28 11:33:34 +01:00
246 changed files with 17637 additions and 6738 deletions

View File

@ -3139,12 +3139,16 @@ $ui-header-height: 55px;
margin-top: 10px;
h4 {
border-bottom: 1px solid lighten($ui-base-color, 8%);
padding: 10px;
font-size: 12px;
text-transform: uppercase;
color: $darker-text-color;
padding: 10px;
font-weight: 500;
border-bottom: 1px solid lighten($ui-base-color, 8%);
a {
color: $darker-text-color;
text-decoration: none;
}
}
@media screen and (max-height: 810px) {