mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-04 23:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17861 commits 5 branches 147 tags 265 MiB
Commit graph

112 commits

Author SHA1 Message Date
Jeremy Kescher
ddc4022845
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/initial_state.js
#	app/javascript/mastodon/initial_state.js
#	app/lib/feed_manager.rb
#	app/services/batched_remove_status_service.rb
#	lib/mastodon/feeds_cli.rb
 2023-03-15 14:13:29 +01:00
Claire
7f3b0dedeb Refactor glitch-soc rich text SCSS 2023-03-05 21:31:45 +01:00
Jeremy Kescher
7318b74ebf
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/models/notification.rb
#	config/locales/simple_form.de.yml
 2023-03-05 12:34:16 +01:00
Claire
cc94cc86ae Fix glitch-soc SCSS code style and refactor closer to upstream 2023-02-25 23:46:23 +01:00
Jeremy Kescher
4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile
#	Gemfile.lock
#	config/sidekiq.yml
 2023-02-18 22:38:53 +01:00
Nick Schonning
ea9a1d79df [Glitch] Upgrade to Stylelint 15 with Prettier 
Port 0c9d455ea5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-18 16:02:12 +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
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
Connor Shea
e76fb9b2c4 [Glitch] Increase the width of the unread notification border. 
Port 08c0e43b6f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-12-15 20:58:22 +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
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
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
prplecake
fc340c9154
Change ul, ol margin-left to 2em (#1879) 2022-11-01 09:41:58 +01: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
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
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
quinn
1f0ff1ea98
Update status.scss 2022-04-05 17:17:00 +10:00
Eugen Rochko
6391a869ae [Glitch] Fix color of show more link in report dialog in web UI 
Port 69f9dc4f4e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-03-23 09:32:59 +01:00
Eugen Rochko
2c5faa5594 [Glitch] Add polls and media attachments to edit comparison modal in web UI 
Port 9f2791eb64 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-03-10 11:30:48 +01:00
Eugen Rochko
470c0a8002 [Glitch] Change report modal to include category selection in web UI 
Port a9a43de6d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-23 20:25:55 +01:00
Eugen Rochko
d4654dc892 [Glitch] Add support for editing for published statuses 
Port front-end changes from 1060666c58 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-01-20 00:03:41 +01:00
Claire
101f8616fe [Glitch] Fix pop-in player display when poster has long username or handle 
Port 1381e0e1d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-07-08 16:23:09 +02:00
ThibG
d8e756eda8 [Glitch] Fix media modal buttons not showing up on mobile 
Port b08d2d4f78 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:47:09 +02:00
Claire
318efa49de Fix various CodeClimate warnings 2021-03-06 14:51:53 +01:00
Eugen Rochko
b0722fbc14 [Glitch] Change RTL detection to rely on unicode-bidi paragraph by paragraph 
Port 1f564051b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-15 16:42:39 +01:00
mayaeh
f5df3d1ae2 [Glitch] Fix width of content text fluctuating over time 
Port 2ae751f19d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-11-04 12:24:40 +01:00
Thibaut Girka
49ee69f75f Add local setting for pop-in player position 2020-10-26 20:51:28 +01:00
Eugen Rochko
47edac871c [Glitch] Fix regressions in icon buttons in web UI 
Port a549415868 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-26 19:51:09 +01:00
Eugen Rochko
8f950e540b [Glitch] Add pop-out player for audio/video in web UI 
port d88a79b456 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-26 19:51:09 +01:00
Thibaut Girka
66e9a77e36 Display unread marker for notifications 2020-09-17 15:22:56 +02:00
Thibaut Girka
ae698469d0 Clean up leftover from DM conversation view redesign 2020-09-17 15:22:56 +02:00
Ariel
f60c78ff3e [Glitch] Fix cursor type in statuses 
Port e9ea960773 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-01 20:18:07 +02:00
ThibG
934bacd05f [Glitch] Change sensitive preview cards to not blur text 
Port a1ad2ad951 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:08:24 +02:00
ThibG
327f6309e4 [Glitch] Fix design issues with sensitive preview cards 
Port 1d2b0d2121 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:28:52 +02:00
ThibG
776aff9656 [Glitch] Hide sensitive preview cards with blurhash 
Port 8e96510b25 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:01:31 +02:00
Mélanie Chauvel (ariasuni)
dcf841545d [Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI 
Port be2f1597cf  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:03 +02:00
ThibG
8a8936725e [Glitch] Fix status overflowing in report dialog 
Port 389e3f6094 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-27 15:59:25 +01:00
ThibG
1e1293e3c8 [Glitch] Add follow_request notification type 
Port 911cc14481 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
ThibG
2ed48037ea [Glitch] Replace fav icon animation with CSS 
Port 3a929dbedd to glitch-soc

And extend that to collapse button

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-27 21:10:24 +01:00
Thibaut Girka
18c07738a6 Fix media components being cropped 2019-10-26 17:51:22 +02:00
Thibaut Girka
a24b954baa Avoid toot text bleeding out of the content div 2019-10-26 17:51:22 +02:00
Eugen Rochko
7ca6153c0c [Glitch] Fix media editing modal and profile directory in light theme 
Port f51f99c3c2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-04 19:12:54 +02:00
trwnh
ec244f6c88 [Glitch] Fix muted text color not applying to all text 
Port d51201a75a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-30 15:58:29 +02:00
Eugen Rochko
7fe2120dd5 [Glitch] Add profile directory to web UI 
Port cb447b28c4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-31 18:23:23 +02:00
Eugen Rochko
3aeaf9b897 [Glitch] Add audio player 
Port 4190e31626 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00