Claire
17ba99e5de
Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict because of glitch-soc's theming change.
Adapted upstream's changes.
- `docker-compose.yml`:
Conflict because of container repo name change.
Adapted upstream's changes.
- `yarn.lock`:
Conflict because of an additional glitch-soc dependency.
Updated the dependencies upstream did.
2025-12-10 18:05:44 +01:00
diondiondion
91500a7f53
Minor Wrapstodon tweaks, add stub Storybook page ( #37186 )
2025-12-10 09:05:14 +00:00
Claire
315f5e5a31
Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream
2025-12-09 18:06:56 +01:00
diondiondion
9d81561bb2
Update Wrapstodon design ( #37169 )
2025-12-09 16:51:05 +00:00
Claire
2f6cdd6d47
Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream
2025-12-05 20:00:40 +01:00
Claire
3b4c4c5b09
Merge commit '65b216353e9bc9ae8517d967f8c2cd8122551fdc' into glitch-soc/merge-upstream
...
- `app/helpers/application_helper.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
- `spec/helpers/application_helper_spec.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
2025-12-05 19:25:40 +01:00
diondiondion
ce22c835ac
Increase maximum height of media items on desktop ( #37136 )
2025-12-05 13:39:48 +00:00
diondiondion
591776d7ad
Fix inversion of emoji colours based on dark/light mode ( #37120 )
2025-12-05 10:08:59 +00:00
Claire
c8f365fd1d
Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream
2025-12-04 20:59:54 +01:00
Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
diondiondion
65b216353e
Handle dark/light/contrast theme modes in common CSS ( #37095 )
2025-12-04 15:56:35 +00:00
diondiondion
498e88f059
Fix color contrast issues caused by new theme tokens ( #37105 )
2025-12-03 15:43:26 +00:00
Claire
d600950b83
Remove unmaintained win95 theme
2025-12-02 21:06:16 +01:00
Claire
13cf55c501
Merge commit '92278796c3d0fa43c08bd59f66815b196fb273a3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream removed the feature flag and refactored, while we have a slightly
different theming system.
Updated accordingly.
- `stylelint.config.js`:
Upstream removed overrides for the temporary themes.
Did the same.
2025-12-02 20:45:10 +01:00
diondiondion
f5d6f60ca7
Ensure all pages have a solid background color ( #37081 )
2025-12-01 14:16:27 +00:00
Claire
99ff59b7b2
Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream
2025-11-30 17:47:27 +01:00
Claire
44e6abe48b
Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream
2025-11-30 16:40:18 +01:00
diondiondion
92278796c3
Remove theme_tokens feature flag & make new styles the default ( #37056 )
2025-11-28 15:58:46 +00:00
diondiondion
5f33ac208f
Limit height of tall images in posts ( #37035 )
2025-11-27 17:05:56 +00:00
diondiondion
2bd7c855b0
Contain tall videos in full-width video container ( #37032 )
2025-11-27 17:05:21 +00:00
Echo
f07cff42c2
Fix media modal misalignment in Safari ( #37034 )
2025-11-27 15:27:18 +00:00
diondiondion
861625fdca
Prevent vertical videos from overflowing the viewport ( #36966 )
2025-11-25 13:21:59 +00:00
Claire
dd7d750f5d
Merge commit '21ce99f746e17867df74029d3b2caca45588818d' into glitch-soc/merge-upstream
2025-11-20 18:13:37 +01:00
Darius Kazemi
dc67dbba82
Remove stray Font Awesome styles ( #36960 )
2025-11-20 10:02:50 +00:00
Claire
7a56972381
Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream
2025-11-19 21:49:09 +01:00
Claire
a4fd9b704a
Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added an experimental feature flag to try out theme refactors.
Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
Ditto.
2025-11-19 21:34:53 +01:00
diondiondion
72c582e7e5
Fix superfluous border & spacing in domains list on the Moderation > Federation page ( #36915 )
2025-11-17 12:07:44 +00:00
diondiondion
284b46fee7
Implement CSS theme tokens behind feature flag ( #36861 )
2025-11-17 09:44:55 +00:00
Claire
d31aaf9ed8
Merge commit '1c3e7545cb6137025a6efd208d195352c54ffda8' into glitch-soc/merge-upstream
2025-11-10 22:18:01 +01:00
diondiondion
400943cb4e
Fix scroll shift caused by fetch-all-replies alerts ( #36807 )
2025-11-10 15:33:56 +00:00
Echo
4ddddc2573
Centers GIFs in media modal ( #36806 )
2025-11-10 13:21:45 +00:00
Claire
58b29be439
Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream
2025-11-06 12:35:04 +01:00
Echo
987104f435
Add default visualizer for audio upload without poster ( #36734 )
2025-11-05 15:33:26 +00:00
diondiondion
947dfcc548
Add some outer page spacing when viewport width equals content width ( #36733 )
2025-11-05 12:17:42 +00:00
Claire
a7ba4ba446
Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream
2025-11-04 20:38:24 +01:00
Echo
3ab5ae1e4a
Quote Posts: Add notifications for DMs and private posts ( #36696 )
2025-11-04 16:32:52 +00:00
Claire
4a9460f7bd
Fix Skeleton placeholders being animated when setting to reduce animations is enabled ( #36716 )
2025-11-04 15:30:10 +00:00
Echo
90d4b3b943
Refactor: Media Modal ( #36673 )
2025-11-04 13:58:35 +00:00
Echo
13457111d5
Remove announcement margin when in Advanced Web Interface ( #36714 )
2025-11-04 13:37:34 +00:00
Claire
6ff4dad89d
Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream
2025-10-31 18:03:21 +01:00
Echo
e7cd5a430e
Refactor carousel components ( #36425 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2025-10-29 14:44:46 +00:00
Claire
48ec31bec8
Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream
...
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.
2025-10-28 22:10:12 +01:00
Claire
26ec19a649
Change styling of column banners ( #36531 )
2025-10-28 14:45:46 +00:00
diondiondion
422fa1cf9f
Revert "Fix custom emoji width ( #27969 )" ( #36620 )
2025-10-28 12:36:22 +00:00
marousta
dc851c9efc
Fix custom emoji width ( #27969 )
2025-10-27 15:56:06 +00:00
Claire
ee9a15031b
Merge commit '9f7075a0ce2b6ecef8d92ef318785fa8ce708688' into glitch-soc/merge-upstream
2025-10-22 18:06:32 +02:00
diondiondion
7538bc77b7
Fix text overflow alignment for long author names in News ( #36562 )
2025-10-22 13:08:51 +00:00
Claire
22e3c0e745
Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a setting adjacent to a glitch-soc-only setting.
Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
Upstream added a setting adjacent to a glitch-soc-only setting.
Added upstream's setting while keeping ours.
2025-10-17 19:00:18 +02:00
Claire
4c0104084d
Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream
2025-10-17 18:36:27 +02:00
diondiondion
6dad80eb8c
Add new "quick boosting" setting ( #36516 )
2025-10-17 13:02:47 +00:00
