Jeremy Kescher
0d829dadea
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/features/ui/index.js
# app/javascript/mastodon/features/ui/index.js
2023-01-18 22:29:27 +01:00
Claire
26c2b401a5
Fix missing admin CSS in glitch-soc flavor ( #2088 )
...
Port SCSS changes from 43f56f1291
2023-01-18 18:54:04 +01:00
Claire
9b4afb320a
[Glitch] Change account moderation notes to make links clickable
...
Port 9b3e22c40d
2023-01-18 17:49:29 +01:00
Peter Simonsson
9205b4e32f
[Glitch] Add checkmark symbol to checkbox
...
Port 7e6ffa085f
2023-01-18 17:48:48 +01:00
Jeremy Kescher
004b2fc290
Merge remote-tracking branch 'upstream/main' into develop
2023-01-15 20:38:42 +01:00
Claire
598888a7c4
[Glitch] Remove hardcoded width from dropdown overlays
...
Port f4a6365f55
2023-01-12 17:48:10 +01:00
Peter Simonsson
a36dfbb2aa
[Glitch] Fix dropdown menu positions when scrolling
...
Port fd33bcb3b2
2023-01-12 11:18:22 +01:00
Jeremy Kescher
48373a71e3
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/components/status_action_bar.js
# app/javascript/flavours/glitch/containers/status_container.js
# app/javascript/flavours/glitch/features/status/components/action_bar.js
# app/javascript/flavours/glitch/locales/de.json
# app/javascript/flavours/glitch/locales/fr.json
# app/javascript/mastodon/components/status_action_bar.js
# app/javascript/mastodon/features/status/components/action_bar.js
# config/locales-glitch/de.yml
# config/locales-glitch/fr.yml
# config/locales-glitch/simple_form.de.yml
# config/locales-glitch/simple_form.fr.yml
2023-01-05 23:29:53 +01:00
Jed Fox
1702907a9d
[Glitch] Improve the contrast of the chart in “poll has ended” notifications
...
Port b81b646e3b
2023-01-05 15:11:23 +01:00
Darius Kazemi
476c131946
[Glitch] Replace flex styling with sensible layout rules
...
Port ef4d29c879
2023-01-02 17:32:29 +01:00
Plastikmensch
08837f730d
Use wrapper div as a spacer ( #2046 )
...
Keeps the alignment of timestamps, while also reducing clickable size
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2022-12-23 18:59:20 +01:00
Plastikmensch
4b51d1386b
Realign timestamps ( #2044 )
...
Add missing display and overflow properties.
Fixes misaligned timestamps and missing overflow in search.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2022-12-23 12:35:03 +01:00
prplecake
6cde3dd08b
Wraps status timestamps in a div ( #2038 )
...
* Wraps status timestamps in a `div`
Fixes #1985
This wraps the status timestamp in a `div` to reduce the clickable
target size of the link. The `div` gets a `margin: 0 0 0 auto` to stick
it to the right margin of the status.
* Update app/javascript/flavours/glitch/styles/components/status.scss
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-12-22 15:18:02 +01:00
Jeremy Kescher
0406f173cf
Merge remote-tracking branch 'reactions/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/locales/de.js
2022-12-17 11:09:32 +01:00
Jeremy Kescher
a1a1d08890
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
2022-12-16 17:53:33 +01:00
Claire
0912fb736d
[Glitch] Add follow request banner on account header
...
Port 70415714f1
2022-12-15 21:11:32 +01:00
Terence Eden
89d3d85cf2
[Glitch] Add transparancy to modal background for accessibility
...
Port ff414a5489
2022-12-15 21:04:20 +01:00
Mina Her
0f5ecb3860
[Glitch] Fix margin for search field on medium window size
...
Port cedf138313
2022-12-15 21:03:14 +01:00
Claire
602f18103c
[Glitch] Fix the top action bar appearing in multi-column layout
...
Port 38596e49d4
2022-12-15 20:59:59 +01:00
Connor Shea
e76fb9b2c4
[Glitch] Increase the width of the unread notification border.
...
Port 08c0e43b6f
2022-12-15 20:58:22 +01:00
Riedler
8cd7b95559
[Glitch] Fix profile avatar being slightly offset into left border
...
Port c3388f4ab1
2022-12-15 20:49:15 +01:00
Claire
ccc01559de
Fix invalid CSS for links in warning and strike cards
2022-12-14 10:11:04 +01:00
Rin
21ee6a777d
[Glitch] fix missing style in warning and strike cards
...
Port 42e16ea52d
2022-12-14 09:26:27 +01:00
cadars
32b8b3355b
[Glitch] Make handle more easily selectable on profile page
...
Port 52a50c5e43
2022-12-14 09:19:23 +01:00
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
2022-12-07 09:11:57 +01:00
Claire
4642f7d830
[Glitch] Fix UI header overflow on mobile
...
Port 76454cc638
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
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
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
2022-11-14 09:16:41 +01:00
Samuel Kaiser
9fd866f38e
[Glitch] Stick batch table toolbar to the top
...
Port e62b514e95
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
2022-11-12 13:56:49 +01:00
Connor Shea
d525ae4bdd
[Glitch] Only remove padding when listing applications
...
Port cf4992c918
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
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
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
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
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
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
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
2022-11-06 17:29:04 +01:00
Eugen Rochko
cbfa5ad5dd
[Glitch] Fix wrong colors in the high-contrast theme
...
Port 1c3192df6b
2022-11-06 17:29:04 +01:00
Eugen Rochko
c883799a1f
[Glitch] Change design of link footer
...
Port 2d9a85db6e
2022-11-06 17:29:04 +01:00
Claire
b6c0ef70a2
[Glitch] Change sign-in banner to reflect disabled or moved account status
...
Port 312d616371
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
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
2022-10-28 19:49:45 +02:00
Claire
2cb3dd9364
[Glitch] Change admin announcement edition interface to use datetime-local
...
Port d9d722d74b
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
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
2022-10-28 19:24:02 +02:00
Eugen Rochko
7bb1b917b2
[Glitch] Change featured hashtags to be displayed in navigation panel
...
Port aefa9253d6
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
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
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
2022-10-28 19:24:02 +02:00
Eugen Rochko
1315c149c0
[Glitch] Add error boundary around routes in web UI
...
Port a43a823768
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
2022-10-28 19:24:02 +02:00
Eugen Rochko
9363e5c24e
[Glitch] Change public accounts pages to mount the web UI
...
Port 839f893168
2022-10-28 19:24:02 +02:00
Eugen Rochko
67b4ecdd21
[Glitch] Change about page to be mounted in the web UI
...
Port 1bd00036c2
2022-10-28 19:24:02 +02:00
Yamagishi Kazutoshi
1850166de9
[Glitch] Hide list panel from nav bar in mobile layout
...
Port d787343325
2022-10-28 19:24:02 +02:00
Eugen Rochko
c36f28ba77
[Glitch] Fix intermediary responsive layout, accessibility on navigation in web UI
...
Port 0765324622
2022-10-28 19:24:02 +02:00
Eugen Rochko
dea951cce8
[Glitch] Add dismissable hints to various timelines in web UI
...
Port f41ec9af05
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
2022-10-28 19:24:02 +02:00
Eugen Rochko
b68b96a0cc
[Glitch] Add server rules to sign-up flow
...
Port 679274465b
2022-10-28 19:24:02 +02:00
Eugen Rochko
206e9593ac
[Glitch] Fix logged-out web UI on smaller screens
...
Port e2b561e3a5
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
2022-10-09 20:45:26 +02:00
Eugen Rochko
757e16a0b5
[Glitch] Add server banner to web app
...
Port d2528b26b6
2022-10-09 20:26:15 +02:00
Eugen Rochko
c9fadb3cae
[Glitch] Add interaction modal to logged-out web UI
...
Port 7fb738c837
2022-10-09 18:23:15 +02:00
Eugen Rochko
1ddd2186de
[Glitch] Add sign-up button to logged-out web UI
...
Port e623c302d5
2022-10-09 18:23:15 +02:00
Eugen Rochko
b38361a347
[Glitch] Fix various issues with logged-out Web UI
...
Port fixes from e623c302d5
2022-10-09 18:23:15 +02:00
Eugen Rochko
0ff1d62c7a
[Glitch] Add logged-out access to the web UI
...
Port part of 43b5d5e38d
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
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
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
