mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-30 15:19:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
15453 commits 217 branches 561 tags 443 MiB
Commit graph

15453 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
5d184b3f77 reuse mx_Pill styles for editor pills to avoid style duplication 
the avatar style code is still different though,
as it's implemented differently

This also prevents updating the css variables when not needed,
which caused the avatar to flicker when updating the editor.
 2019-05-21 12:19:35 +02:00
Bruno Windels
b00a38a1e5 apply mx_EventTile_content to editor, so it gets the same right margin 
this way we don't have to include it in the magic number
 2019-05-21 12:18:20 +02:00
Bruno Windels
2bacabc002 apply 34px margin the mx_EventTile_content also has 
so width of editor stay the same as content
(unrelated to pills, really)
 2019-05-20 16:01:31 +02:00
Bruno Windels
5d80c3a2a4 fallback to avatar bg color 2019-05-20 15:39:06 +02:00
Bruno Windels
01ef1dd20e style room pills correctly 2019-05-20 15:38:59 +02:00
Bruno Windels
df4f380082 find room by alias in room pill 2019-05-20 15:34:15 +02:00
Bruno Windels
0e98b124ac undo thinko of passing current room as pill room 2019-05-20 15:33:54 +02:00
Bruno Windels
230e53fe2f move most of room avatar handling to Avatar, to reuse in editor pills 2019-05-20 15:33:26 +02:00
Bruno Windels
5edfd01cb2 remove unused _getInitialLetter 2019-05-20 14:49:59 +02:00
Bruno Windels
c1b2f3dce1 make user pill avatars work in editor 2019-05-20 14:21:25 +02:00
Bruno Windels
e58d844e5b move getInitialLetter to Avatar so we can reuse it for editor pills 2019-05-20 14:20:36 +02:00
Bruno Windels
a47e722fa1 same height as normal pill 2019-05-20 10:28:26 +02:00
Bruno Windels
3b598a1782 set pill avatar through css variables to set on psuedo-element 
this way it won't interfere with editor selection/caret
 2019-05-20 10:28:26 +02:00
Bruno Windels
710338c01f pass member and room to editor pills to get avatar url 2019-05-20 10:28:26 +02:00
Bruno Windels
0c0052d06e re-apply formatting when editor is closed 2019-05-20 10:19:29 +02:00
Bruno Windels
d81ab2464b better button alignment 
also fix sticking out at the right side when not overlaying
 2019-05-17 16:15:06 +01:00
Bruno Windels
8ce8ca18ff theme-ify! 2019-05-17 16:10:21 +01:00
Bruno Windels
aef9323f21 explain negative margin 2019-05-17 16:10:11 +01:00
Bruno Windels
f9462d1012 hide timestamp while editing 2019-05-17 16:01:52 +01:00
Bruno Windels
5adae63555 don't apply formatting to body when showing editor in TextualBody 
it throws
 2019-05-17 16:01:30 +01:00
Bruno Windels
aeea4ee83a a bit more horizontal padding for the editor 2019-05-17 16:00:58 +01:00
Bruno Windels
cf8189ed43 align buttons perfectly with editor edge 2019-05-17 16:00:39 +01:00
Bruno Windels
81245e9c05 cull editor height to 200px 2019-05-17 16:00:22 +01:00
Bruno Windels
2544decab2 fix chrome not right aligning buttons 2019-05-17 16:00:08 +01:00
Bruno Windels
578a183f49 hide the action bar while editing 2019-05-17 15:35:28 +01:00
Bruno Windels
62b8973e72 cancel the edit when pressing escape 2019-05-17 15:35:14 +01:00
Bruno Windels
ddefeae136 update design of editor to look as close to original tile (and design) 
the buttons below the composer are overlayed onto the previous event.
In case of the last event, for now we make them not overflow, but make the
tile grow. The design says it should overlay on the main composer for the last
event tile, postponing that for a bit though as not sure what is the best way
to do that.
 2019-05-17 15:33:11 +01:00
Bruno Windels
9a3752c571 show message editor in textual body instead of replacing event tile 2019-05-17 15:30:07 +01:00
Bruno Windels
76ceee0e6c silence react warning when showing edited marker, by also giving the body a key 2019-05-17 13:31:26 +01:00
J. Ryan Stinnett
4c94b398d3
Merge pull request #2991 from matrix-org/jryans/reaction-names-tooltip 
Add a basic tooltip showing who reacted
 2019-05-17 13:02:29 +01:00
J. Ryan Stinnett
603e6b7055 Adjust edited tooltip to use shared styles 2019-05-17 12:19:02 +01:00
J. Ryan Stinnett
059988ff5c Extract tooltip styling to a shared class 
We want to use the same styling with edited tooltip as well, so this extracts
the shared bits.
 2019-05-17 12:11:01 +01:00
J. Ryan Stinnett
3da1f73ea4 Add a basic tooltip showing who reacted 
This adds a first attempt at tooltip showing who reacted to a message. It
doesn't limit senders or position the tooltip nicely, but the info is there at
least.

Part of https://github.com/vector-im/riot-web/issues/9722
 2019-05-17 12:11:01 +01:00
J. Ryan Stinnett
32c68feae2 Run translation substitution in 2 passes 
By first substituting variables and then tags after, the translation handling
can now support strings with variables inside tags, such as:

"people <span>reacted with %(foo)s</span>"
 2019-05-17 12:11:01 +01:00
Bruno Windels
c48ecb66d9
Merge pull request #2990 from matrix-org/bwindels/editedmarker 
Message editing: show (edited) marker on edited messages, with tooltip
 2019-05-17 11:04:09 +00:00
Bruno Windels
4a6725d4c2 Message editing: show (edited) marker on edited messages, with tooltip 2019-05-17 11:36:36 +01:00
David Baker
aa7ae4bd4f
Merge pull request #2989 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-05-17 10:54:26 +01:00
Weblate
48e2aad6d0 Merge branch 'origin/develop' into Weblate. 2019-05-17 09:40:15 +00:00
Bruno Windels
4bfa385b2e
Merge pull request #2988 from matrix-org/bwindels/donteditimages 
Message editing: only allow editing of text messages
 2019-05-17 09:40:10 +00:00
Weblate
658fb3506a Merge branch 'origin/develop' into Weblate. 2019-05-17 09:36:36 +00:00
Bruno Windels
396a06a868
Merge pull request #2987 from matrix-org/bwindels/entertosendedit 
Message editing: shift+enter for newline, enter to send
 2019-05-17 09:36:31 +00:00
Weblate
90d2097275 Merge branch 'origin/develop' into Weblate. 2019-05-17 09:26:46 +00:00
Filip Š
317898048e Translated using Weblate (Slovenian) 
Currently translated at 0.7% (11 of 1628 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sl/
 2019-05-17 09:26:46 +00:00
Szimszon
34bd70f738 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1628 of 1628 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-05-17 09:26:45 +00:00
Tuomas Hietala
2beb854d92 Translated using Weblate (Finnish) 
Currently translated at 98.9% (1610 of 1628 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-05-17 09:26:42 +00:00
Travis Ralston
e731ce32b8 Translated using Weblate (English (United States)) 
Currently translated at 44.1% (718 of 1628 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2019-05-17 09:26:38 +00:00
Bruno Windels
c0cfa8ad00 only allow editing of text messages 2019-05-17 10:26:19 +01:00
Bruno Windels
ca2e6d8eb2 Message editing: shift+enter for newline, enter to send 2019-05-17 10:22:02 +01:00
Travis Ralston
0070540b8a
Merge pull request #2985 from matrix-org/t3chguy/fix_devtools_alignment 
Apply Flex voodoo for devtools send event dialog
 2019-05-16 17:46:13 -06:00
Michael Telatynski
b2aad4afb1 remove accidental paste 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-17 00:28:45 +01:00