[Glitch] Fix “Back” button sometimes redirecting out of Mastodon Port a442a1d1c69e5d477ca1c05f0bc5fc0f6894b223 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.
Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes
Fix “Back” button sometimes redirecting out of Mastodon (#25281)
[Glitch] Fix for "follows you" indicator in light web UI not readable Port 97ce47e45100548f258644fc14314dbf3db94973 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Prevent split line between icon and number on reposts & favourites Port b923a4c7557ca0967d80dbe892b1517fcd0e9a41 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge branch 'main' into glitch-soc/merge-upstream
Fix for "follows you" indicator in light web UI not readable (#25993)
Reduce dropdown menu margin and padding (#2301) * Reduce dropdown menu margin and padding * Change horizontal padding back to what it was * Reduce separator vertical margins for consistency
Prevent split line between icon and number on reposts & favourites (#26004)
Merge pull request #2300 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes
[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface Port 71db616fed817893d0efa363f0e7dbfcf23866a0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Change links in multi-column mode so tabs are open in single-column mode Port 5fad7bd58a9c2541938f63e73a6ebdbfd0045903 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Remove layout glitch-soc settings
[Glitch] Fix dropdowns being disabled for logged out users in web UI Port a8edbcf963f5d029f5af020fe7d736e6255638be to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix embed dropdown menu item for unauthenticated users Port 41f65edb213dc34e723e5bcc7d3ea920752941ef to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
Fix notifications not loading when slow mode active (#2292) When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column. This change has been missed in e91bf82083ac390a0cf229d8e94fa412fdec57ff Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes
Fix home timeline's regexp field