Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream

Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.
This commit is contained in:
Claire
2025-12-15 20:22:20 +01:00
65 changed files with 958 additions and 344 deletions

View File

@@ -628,11 +628,6 @@ body > [data-popper-placement] {
gap: 8px;
margin: 8px;
flex-wrap: wrap;
& > div {
overflow: hidden;
display: flex;
}
}
&__uploads {
@@ -772,7 +767,6 @@ body > [data-popper-placement] {
align-items: center;
flex: 1 1 auto;
max-width: 100%;
overflow: hidden;
}
&__buttons {
@@ -932,6 +926,11 @@ body > [data-popper-placement] {
text-overflow: ellipsis;
white-space: nowrap;
&:focus-visible {
outline: var(--outline-focus-default);
outline-offset: 2px;
}
&[disabled] {
cursor: default;
color: var(--color-text-disabled);