759 commits

Author	SHA1	Message	Date
fef	0157438894	merge catcatnya/main into main	2022-11-28 22:47:46 +00:00
Jeremy Kescher	f34d3b838e	Merge remote-tracking branch 'upstream/main' into develop	2022-11-26 14:02:07 +01:00
Claire	6517b7b9f0	Fix pillbar buttons in light theme (#1972) ... * Simplify pillbar button design and make it more consistent with toggles * Fix pillbar buttons in light theme Fixes #1970	2022-11-25 13:54:43 +01:00
fef	e4f17273a3	improve animations	2022-11-20 22:45:09 +00:00
fef	e17b23f0b6	fix some more colors	2022-11-20 22:44:48 +00:00
fef	860fa1e79d	tweak and fix some colors	2022-11-19 05:41:39 +00:00
fef	c32515a620	bring back wider border radius	2022-11-16 04:29:56 +00:00
fef	16d6c4a145	rewrite homogay flavour ... this version attempts to hack more directly into the whole theming stuff, rather than build on top of it like the previous one.	2022-11-16 03:55:56 +00:00
fef	6dac57f914	merge catcatnya/main into main	2022-11-16 01:14:27 +00:00
Jeremy Kescher	122870cb6b	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # config/initializers/rack_attack.rb # lib/mastodon/version.rb	2022-11-14 22:18:48 +01:00
Eugen Rochko	9db90d2ebe	[Glitch] Fix dropdown menu on profiles not being accessible on narrow screens in web UI ... Port 6da9df774e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-14 09:16:41 +01:00
Samuel Kaiser	9fd866f38e	[Glitch] Stick batch table toolbar to the top ... Port e62b514e95 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-14 09:05:56 +01:00
Jeremy Kescher	c40b063bd4	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # lib/mastodon/version.rb	2022-11-12 14:38:59 +01:00
Eugen Rochko	400d168310	[Glitch] Fix domain blocks on about page not working well on small screens in web UI ... Port 6774c339b2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-12 13:56:49 +01:00
Connor Shea	d525ae4bdd	[Glitch] Only remove padding when listing applications ... Port cf4992c918 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-12 13:55:43 +01:00
Claire	3fa6c603ba	[Glitch] Fix color of the “No description added“ media upload warning on light theme ... Port 89a6b76f99 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-12 13:48:42 +01:00
Claire	6a96b17a2d	Add “Glitch-only” label to glitch-specific settings	2022-11-12 11:30:35 +01:00
Claire	1ce29aeabf	Change "Allow trends without prior review' setting to include statuses ... Port SCSS changes from 546672e292 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-12 10:59:17 +01:00
fef	3dabe1d175	Merge from upstream	2022-11-11 19:57:22 +00:00
fef	5a70c18ad7	add homogay flavour	2022-11-11 01:10:25 +00:00
Jeremy Kescher	4886f1955b	Merge remote-tracking branch 'upstream/main' into develop	2022-11-10 21:11:05 +01:00
Eugen Rochko	65b6c4f6df	[Glitch] Change larger reblogs/favourites numbers to be shortened in web UI ... Port 7bdb2433f1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-10 10:15:21 +01:00
Eugen Rochko	d3a29a136c	[Glitch] Fix profile header being cut off in light theme in web UI ... Port e37e8deb0f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-10 09:51:46 +01:00
Jeremy Kescher	5b797a34df	Merge remote-tracking branch 'upstream/main' into develop	2022-11-08 23:30:01 +01:00
Zach Flanders	6eac1cfccd	[Glitch] Fix spoiler buttons css not rendering correct color in light theme ... Port 0beb095a4b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-08 15:47:48 +01:00
Jeremy Kescher	ffa93fa157	Merge remote-tracking branch 'upstream/main' into develop	2022-11-08 07:26:59 +01:00
Claire	c493c967d6	Fix light theme issues with the favourite modal and some background colors (#1902) ... * Fix favourite modal styling in glitch-soc light theme * Fix unnecessary difference between glitch-soc's light theme and upstream's	2022-11-07 10:34:18 +01:00
Sunny Ripert	7ba13dddfa	[Glitch] Fix double button to clear emoji search input ... Port 4b7f32a2a6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-07 07:55:44 +01:00
Jeremy Kescher	03f50f2f00	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js # lib/mastodon/version.rb # public/avatars/original/missing.png	2022-11-06 20:59:47 +01:00
Claire	0be6da42d3	Change glitch-soc composer classes to match upstream	2022-11-06 17:29:04 +01:00
Eugen Rochko	c199387558	[Glitch] Fix colors in light theme ... Port 20aa8881dc to glitch-soc	2022-11-06 17:29:04 +01:00
Eugen Rochko	cbfa5ad5dd	[Glitch] Fix wrong colors in the high-contrast theme ... Port 1c3192df6b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-06 17:29:04 +01:00
Eugen Rochko	c883799a1f	[Glitch] Change design of link footer ... Port 2d9a85db6e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-06 17:29:04 +01:00
Claire	b6c0ef70a2	[Glitch] Change sign-in banner to reflect disabled or moved account status ... Port 312d616371 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-06 17:29:04 +01:00
Jeremy Kescher	22427cd43c	Merge remote-tracking branch 'upstream/main' ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js # app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js	2022-11-01 10:23:35 +01:00
prplecake	fc340c9154	Change ul, ol margin-left to 2em (#1879)	2022-11-01 09:41:58 +01:00
Jeremy Kescher	7f6215984b	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml	2022-10-31 21:37:48 +01:00
Eugen Rochko	8048874a3a	[Glitch] Fix sidebar and tabs on settings on small screens in admin UI ... Port ad83e64795 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-30 18:32:20 +01:00
Eugen Rochko	9f6c175550	[Glitch] Fix number of uses being shown again on trending hashtags in web UI ... Port 923f06a07c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:49:45 +02:00
Claire	2cb3dd9364	[Glitch] Change admin announcement edition interface to use datetime-local ... Port d9d722d74b to glitch-soc Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:49:45 +02:00
Robert Laurenz	047a2f1f1b	[Glitch] fix(component): adjust style of counter button to fix overflow issue ... Port 10922294ff to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:49:45 +02:00
Eugen Rochko	80b53623e1	[Glitch] Change settings area to be separated into categories in admin UI ... Port 7c152acb2c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:24:02 +02:00
Eugen Rochko	7bb1b917b2	[Glitch] Change featured hashtags to be displayed in navigation panel ... Port aefa9253d6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:24:02 +02:00
Eugen Rochko	e9ccee38a7	[Glitch] Change floating action button to be a button in header in web UI ... Port 1fd6460b02 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:24:02 +02:00
Eugen Rochko	2d731dbde6	[Glitch] Add ability to view previous edits of a status in admin UI ... Port f8ca3bb2a1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:24:02 +02:00
Eugen Rochko	bfa47eb7d6	[Glitch] Fix language dropdown causing zoom on mobile devices in web UI ... Port 3ad0a2ae3d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:24:02 +02:00
Eugen Rochko	1315c149c0	[Glitch] Add error boundary around routes in web UI ... Port a43a823768 to glitch-soc Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:24:02 +02:00
Eugen Rochko	92385da9c3	[Glitch] Fix reply not opening compose page on certain screen sizes in web UI ... Port 56efa8d22f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:24:02 +02:00
Eugen Rochko	9363e5c24e	[Glitch] Change public accounts pages to mount the web UI ... Port 839f893168 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:24:02 +02:00
Eugen Rochko	67b4ecdd21	[Glitch] Change about page to be mounted in the web UI ... Port 1bd00036c2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-28 19:24:02 +02:00