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

17 commits

Author SHA1 Message Date
Essem
4edbebfbac
Fix reaction picker dropdown appearance 2024-02-25 18:16:15 +01:00
Jeremy Kescher
004b22602b
Merge branch 'emoji-reactions-base' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/components/status.jsx
#	app/javascript/flavours/glitch/locales/en.json
#	app/javascript/flavours/glitch/styles/components.scss
 2024-02-24 11:08:13 +01:00
Claire
5f50b634cf
Further reduce CSS and markup differences with upstream (#2635) 
* Further reduce CSS differences with upstream

* Reduce differences in markup and CSS with upstream

* Redo collapsible post notifications

* Reduce CSS differences further

* Reduce differences with upstream regarding `.status` and `.status__wrapper`

* Further reduce differences with upstream

* Reduce differences with upstream in DisplayName
 2024-02-20 18:49:59 +01:00
Jeremy Kescher
e995f70ed3
Fix certain jsx files being in an old state in relation to the emoji reactions PR 2024-02-16 15:12:22 +01:00
Jeremy Kescher
5d4cfe4cd8
Merge branch 'glitch-soc' into develop 2024-01-17 22:37:29 +01:00
Renaud Chaput
5b67389bba [Glitch] Add a new @/ alias for the root frontend directory and use it where possible 
Port 01b6c83c36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-16 12:21:13 +01:00
Claire
a1920425ca [Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons 
Port 6bbcd9348e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-15 20:53:08 +01:00
Renaud Chaput
8cad0a4d6b [Glitch] Change icon SVG imports to use a default import 
Port 608f66f978 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-15 20:20:38 +01:00
Jeremy Kescher
ad4e692669
Set heart_plus as reaction button icon 2024-01-14 19:03:01 +01:00
Jeremy Kescher
2047683539
v4.3.0-alpha.0+glitch+cat+1.0.8 2024-01-14 17:48:42 +01:00
Eugen Rochko
d54414866c [Glitch] Change icons in web UI 
Port 134de736dc to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-13 23:19:01 +01:00
Essem
6ae86f40d1
Add support for emoji reactions 
Squashed, modified, and rebased from glitch-soc/mastodon#2221.

Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-12-29 12:33:13 -06:00
gunchleoc
09ebf7e37c [Glitch] Replace 'favourite' by 'favorite' for American English 
Port 217ef7f2af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 14:44:36 +02:00
Claire
7d7db8977b Fix import order with ESLint 
Port d27216dc46 to glitch-soc
 2023-05-28 16:38:10 +02:00
Claire
6001f5ff36 [Glitch] Use the new JSX transform everywhere 
Port 8f66126b10 to glitch-soc
 2023-05-28 14:18:43 +02:00
Renaud Chaput
5f2071d055 [Glitch] Enforce stricter rules for Typescript files 
Port c8181eb0a4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-09 22:56:26 +02:00
Renaud Chaput
81ef21a0c8 [Glitch] Rename JSX files with proper .jsx extension 
Port 44a7d87cb1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:35:31 +01:00
Renamed from app/javascript/flavours/glitch/components/status_prepend.js (Browse further)