Claire
8f58c42ca3
Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream
2026-02-06 22:45:55 +01:00
Itoh Shimon
96de28dd6f
Enable coexistence of horizontal and vertical posts ( #37204 )
2026-02-06 09:51:22 +00:00
Claire
13499168f8
Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream
2026-02-03 15:44:04 +01:00
Echo
346ca87ee8
Profile redesign: Follow button and menu reorg ( #37707 )
2026-02-03 11:33:20 +00:00
Claire
5b926157e8
Merge commit '6188de3efc293a6327cabcb858430aa79564dfd7' into glitch-soc/merge-upstream
2026-02-02 18:26:04 +01:00
ahxxm
c6f5315aa9
Add text-autospace to status content ( #37694 )
2026-02-02 14:03:55 +00:00
Claire
b490913ad7
Merge commit 'a7a33ef6bc61cf10ef654313cfb7a45fe2b58ae3' into glitch-soc/merge-upstream
2026-01-30 18:00:16 +01:00
diondiondion
a7a33ef6bc
Adds new Checkbox and CheckboxField components ( #37665 )
2026-01-30 14:44:28 +00:00
Claire
5a45a3203a
Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream
2026-01-27 18:03:27 +01:00
Echo
76ab866d93
Deprecate need for revert-layer CSS ( #37632 )
2026-01-27 14:45:35 +00:00
Claire
95aaefe083
Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream
2026-01-21 22:04:02 +01:00
Echo
e79d51ce19
Profile redesign: verified badges ( #37538 )
2026-01-21 13:08:08 +00:00
Claire
7839c8d9af
Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream simplified `theme_style_tags`. Our version is different because of
the different theming system.
Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
Theming system.
2026-01-16 23:22:19 +01:00
diondiondion
e715bb5075
Add high-contrast styles to common stylesheet ( #37523 )
2026-01-16 13:57:48 +00:00
Claire
ba45eb8764
Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Upstream changed how theming works, and in particular changed the set of HTML attributes.
Adapted upstream's change.
2026-01-15 18:02:35 +01:00
diondiondion
bc2f8a358f
Enable theming via new HTML element attributes ( #37477 )
2026-01-15 16:04:27 +00:00
Claire
d7254ecec4
Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream
2026-01-10 13:12:36 +01:00
Echo
de7b405e55
Video modals should not be pushed down on mobile ( #37421 )
2026-01-08 09:44:17 +00:00
Claire
c7ad055ff3
Merge commit 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
- `app/views/layouts/application.html.haml`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
2026-01-03 15:26:58 +01:00
Claire
04f4725249
Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream
2025-12-19 18:43:09 +01:00
diondiondion
a0ce77673c
Add dedicated user preferences for theme mode & contrast ( #37288 )
2025-12-19 15:31:44 +00:00
diondiondion
a505c2efd8
Fix mobile admin sidebar displaying under batch table toolbar ( #37307 )
2025-12-19 08:39:25 +00:00
Claire
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
diondiondion
9e97ad04d8
Fix bad contrast on disabled dropdown menu items ( #37268 )
2025-12-16 11:38:47 +00:00
Claire
1fdb48c668
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.
2025-12-15 20:22:20 +01:00
diondiondion
a9e228361c
Fix badly visible focus outlines in composer ( #37250 )
2025-12-15 12:39:04 +00:00
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
