Commit graph

813 commits

Author SHA1 Message Date
fef
bdd3c4691d
fix padding on posts without reactions
The margins of the elements above and below the
main reaction list element overlapped before
reactions were added.  Adding display: none to
empty reaction bars restores this exact look.
2022-12-09 23:08:42 +01:00
fef
fd885bec48
fix reaction margins and paddings 2022-12-09 23:04:13 +01:00
fef
266bf2543d
fix padding for reaction button 2022-12-09 23:04:12 +01:00
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop 2022-12-07 17:49:14 +01:00
Juan Xavier Gomez
16fb604c52 [Glitch] Fix hidden overflow on interaction modal
Port 21b208afcb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-07 09:11:57 +01:00
Claire
4642f7d830 [Glitch] Fix UI header overflow on mobile
Port 76454cc638 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-07 09:10:47 +01:00
Jeremy Kescher
32600375b3
Merge remote-tracking branch 'upstream/main' into develop 2022-12-01 20:57:06 +01:00
Claire
4ac6601476
Port navigation bar from upstream (#1986)
Fixes #1977
2022-12-01 20:06:08 +01:00
Jeremy Kescher
495da7d1a8
Merge remote-tracking branch 'upstream/main' into develop 2022-11-30 18:24:52 +01:00
Claire
620b079a78 Fix inconsistent with “translate” button padding 2022-11-30 13:53:38 +01:00
Eugen Rochko
f7684a31fe [Glitch] Change design of translations in web UI
Port fcca781aae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +01:00
Jeremy Kescher
730a09f642
v4.0.2+1.0.6 2022-11-29 00:15:08 +01:00
Connor Shea
f51990bd62 [Glitch] Make the 'Trending now' header a link to Explore.
Port cec1e902e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-28 11:59:00 +01: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
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
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
Yamagishi Kazutoshi
1850166de9 [Glitch] Hide list panel from nav bar in mobile layout
Port d787343325 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
c36f28ba77 [Glitch] Fix intermediary responsive layout, accessibility on navigation in web UI
Port 0765324622 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
dea951cce8 [Glitch] Add dismissable hints to various timelines in web UI
Port f41ec9af05 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
07df273f37 [Glitch] Change privacy policy to be rendered in web UI, add REST API
Port a2ba011326 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
b68b96a0cc [Glitch] Add server rules to sign-up flow
Port 679274465b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
206e9593ac [Glitch] Fix logged-out web UI on smaller screens
Port e2b561e3a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Jeremy Kescher
db5e2e5caf
Merge remote-tracking branch 'upstream/main' into develop 2022-10-28 18:32:30 +02:00
Claire
19765216a1
Fix status prepend design (#1874)
* Fix status prepend design

* Adjust status prepend styling a bit
2022-10-28 08:47:10 +02:00
Jeremy Kescher
f314520459
Merge remote-tracking branch 'upstream/main' into develop 2022-10-10 06:45:32 +02:00
Eugen Rochko
d04fbe6fe0 [Glitch] Change font size of active users in server banner to be larger in web UI
Port 0e41d360c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 20:45:26 +02:00
Eugen Rochko
757e16a0b5 [Glitch] Add server banner to web app
Port d2528b26b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 20:26:15 +02:00
Eugen Rochko
c9fadb3cae [Glitch] Add interaction modal to logged-out web UI
Port 7fb738c837 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 18:23:15 +02:00
Eugen Rochko
1ddd2186de [Glitch] Add sign-up button to logged-out web UI
Port e623c302d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 18:23:15 +02:00
Eugen Rochko
b38361a347 [Glitch] Fix various issues with logged-out Web UI
Port fixes from e623c302d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 18:23:15 +02:00
Eugen Rochko
0ff1d62c7a [Glitch] Add logged-out access to the web UI
Port part of 43b5d5e38d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 15:29:14 +02:00
Jeremy Kescher
5da4f13737
Merge remote-tracking branch 'upstream/main' into develop 2022-10-09 12:13:47 +02:00
Claire
7ba5905416 Restore ability to discard interactions-based follow suggestions 2022-10-09 11:23:06 +02:00
Jeremy Kescher
c35630e472
Merge remote-tracking branch 'upstream/main' into develop 2022-10-08 21:07:06 +02:00
Eugen Rochko
058b74dc0a [Glitch] Add explore page to web UI
Port d4592bbfcd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Claire
30f4268f32
[Glitch] Add ability to select all accounts matching search for batch (#1857)
Port SCSS changes from 5b0e8cc92b

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-10-08 16:24:35 +02:00
Jeremy Kescher
a300c9d332
Merge remote-tracking branch 'upstream/main' into develop 2022-09-10 11:00:56 +02:00
Mélanie Chauvel
9d7c323abd
Make composers button all aligned and the same size (#1843) 2022-09-07 19:37:46 +02:00
Jeremy Kescher
691f82d346
Oatstodon flavour: Make avatars rounded squares again rather than circles 2022-08-27 11:24:24 +02:00
Jeremy Kescher
f9f3ed9c84
Add Oatstodon glitch flavour 2022-08-27 10:49:42 +02:00
Claire
0b733ca790 [Glitch] Add ability to filter individual posts
Port 50487db122 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Rens Groothuijsen
41fa50ac86 [Glitch] Add warning for sensitive audio posts
Port e6979aa6d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-15 14:57:57 +02:00
Mélanie Chauvel
f174ce1048
Use slightly more margin between post buttons (under compose box) (#1816) 2022-07-27 19:17:15 +02:00
Eugen Rochko
1ceebf2710 [Glitch] Change hashtag numbers to have clearer labels in web UI
Port f5d8501138 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:41:39 +02:00
Yamagishi Kazutoshi
969d805e86 [Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
Port d5ca204e89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:39:57 +02:00
Jeong Arm
7205098ccf [Glitch] Fix badge color not affected
Port f248d95be2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-19 16:11:40 +02:00
Eugen Rochko
30e7836a19 [Glitch] Add customizable user roles
Port front-end changes from 44b2ee3485 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-05 11:35:32 +02:00
Eugen Rochko
485b43ed7e [Glitch] Add notifications for new reports
Port 2936f42a14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 13:13:10 +02:00
Claire
f218e633b4 [Glitch] [SSR only] Revamp post filtering system
Port CSS and JS for Server-Side Rendered pages from 02851848e9

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 11:35:28 +02:00
mayaeh
97f81577f1 [Glitch] Fixed the setting page's logo that is not displayed on the smartphone
Port 65ad589848 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 11:21:58 +02:00
Eugen Rochko
353e2c5d84 [Glitch] Fix contrast of some elements with new brand colors
Port 0391b2a603 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-21 09:00:43 +02:00
Claire
7a75bce1b4
Fix checkmark on interaction buttons with larger fonts (#1799)
Fixes #1796
2022-06-16 15:37:59 +02:00
Claire
f938afee72 [Glitch] Fix logo gradient not working on some Safari and Blink-based browsers
Port 37cd984acf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-11 00:09:20 +02:00
Eugen Rochko
b31c32fd61 [Glitch] Change brand color and logotypes
Port SCSS changes from 45aa5781ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-11 00:09:20 +02:00
Eugen Rochko
d064476c4a [Glitch] Add administrative webhooks
Port SCSS changes from a2871cd747 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-10 17:04:02 +02:00
Claire
3d841eba69
Fix language indicator text color (#1795)
Fixes #1794
2022-06-06 12:05:57 +02:00
Claire
53c89ee44b
Add language indicator icon and local settings for status icons (#1788)
* Add language indicator

* Add local settings for status icons

* Switch to text icon for language
2022-05-27 16:34:29 +02:00
Claire
444b650094
Add checkmark on top of status icon buttons when they are active (#1783) 2022-05-25 15:09:45 +02:00
Yamagishi Kazutoshi
228ec75048 [Glitch] Fix languages dropdown on light theme
Port e925b06721 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-24 14:23:03 +02:00
Eugen Rochko
2e5fb45be5 [Glitch] Add language dropdown to compose in web UI
Port 0cdb077570 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-16 23:06:29 +02:00
Claire
dc350be6f5
Use upstream's settings for CW auto-expand and column swiping (#1770)
* Use Mastodon server-side settings for automatically expanding toots with CWs

* Add modal warning about settings changes

* Use Mastodon server-side settings for disabling swiping
2022-05-15 17:30:40 +02:00
Eugen Rochko
6fb837aa1d [Glitch] Add limited attribute to accounts in REST API and a warning in web UI
Port b4d373a3df to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 11:59:08 +02:00