Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed stuff too close to glitch-soc's theming system changes.
  Applied upstream's changes.
- `streaming/index.js`:
  Upstream refactored a bunch of stuff where our code was different due to
  local-only posts.
  Applied upstream's changes while taking care of local-only posts.
This commit is contained in:
Claire
2025-10-28 22:10:12 +01:00
parent 3bd56b92c1 4896d2c4c6
commit 48ec31bec8
136 changed files with 1041 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/styles/mastodon/components.scss
View File

@@ -4031,6 +4031,7 @@ a.account__display-name {
background: lighten($ui-highlight-color, 5%);
}
.follow_requests-unlocked_explanation,
.switch-to-advanced {
color: $light-text-color;
background-color: $ui-base-color;
@@ -4041,7 +4042,7 @@ a.account__display-name {
font-size: 13px;
line-height: 18px;
.switch-to-advanced__toggle {
a {
color: $ui-button-tertiary-color;
font-weight: bold;
}
@@ -5223,8 +5224,7 @@ a.status-card {
}
}
.empty-column-indicator,
.follow_requests-unlocked_explanation {
.empty-column-indicator {
color: $dark-text-color;
text-align: center;
padding: 20px;
@@ -5263,10 +5263,8 @@ a.status-card {
}
.follow_requests-unlocked_explanation {
background: var(--surface-background-color);
border-bottom: 1px solid var(--background-border-color);
contain: initial;
flex-grow: 0;
margin: 16px;
margin-bottom: 0;
}
.error-column {