mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity
16315 commits 217 branches 561 tags 411 MiB
Commit graph

987 commits

Author SHA1 Message Date
Travis Ralston
635b1ff612
Merge pull request #2928 from Half-Shot/hs/custom-notif-sounds 
Custom notification sounds for rooms
 2019-06-03 14:31:38 -06:00
Matthew Hodgson
f9d40940e8 upgrade to twemoji 12.0.4 2019-06-02 06:09:03 +01:00
Matthew Hodgson
e8d8eee67b fix ligatures fully 2019-06-02 05:36:59 +01:00
Matthew Hodgson
1abd3db40c add extra ligatures 2019-06-02 04:46:00 +01:00
Matthew Hodgson
caa950f625 add SBIX fallback twemoji font 2019-06-02 04:24:36 +01:00
Travis Ralston
1c41629376
Merge pull request #3043 from matrix-org/travis/check-login-for-config 
Accept JSX into the GenericErrorPage and expose local session vars
 2019-05-31 11:03:41 -06:00
Will Hunt
9369e964fa Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds 2019-05-31 10:44:30 +01:00
J. Ryan Stinnett
2be00ee0e0 Native emoji require extra line-height 
Increase line-height so that native emoji aren't cut off when we fall back to
them.

Fixes https://github.com/vector-im/riot-web/issues/9898
 2019-05-30 10:26:12 +01:00
Travis Ralston
5c85f4609e Accept JSX into the GenericErrorPage and expose local session vars 2019-05-29 12:09:04 -06:00
Travis Ralston
14dc4b47fa Merge branch 'develop' into travis/feature/wellknown2 2019-05-22 23:05:54 -06:00
J. Ryan Stinnett
e01a6ce24c Add Segoe UI Emoji as native fallback for Windows 2019-05-22 16:27:03 +01:00
Bruno Windels
ee86471691 remove SBIX font and fallback to native emoji 2019-05-22 13:06:04 +02:00
Bruno Windels
3d9e631d18
no space in !important 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-22 09:35:09 +00:00
Bruno Windels
1bdcb0c35a remove obsolete comments 2019-05-22 11:19:35 +02:00
Bruno Windels
1345db5f98 remove fira font 2019-05-22 11:16:29 +02:00
Matthew Hodgson
0024a88daf Inconsolata 2019-05-22 03:05:57 +01:00
Matthew Hodgson
4ae652e5c3 load twemoji dynamically as colr or sbix; fix monospace 2019-05-22 02:31:24 +01:00
Travis Ralston
907c7ed119
Merge pull request #2994 from matrix-org/travis/screenreader/topleftmenu 
Update TopLeftMenu for accessibility: Keyboard shortcut, reduced screen reader noise
 2019-05-21 09:52:26 -06:00
Bruno Windels
ef4fe52d6b
Merge pull request #3002 from matrix-org/bwindels/pill-avatar-fixup 
Fixup: also change editor margin when last event and buttons are not overlaying
 2019-05-21 14:33:39 +00:00
Bruno Windels
30d374dff4 also changing margin when last event and buttons are not overlaying 2019-05-21 16:06:14 +02:00
Bruno Windels
2d4d608ed6
Merge pull request #2997 from matrix-org/bwindels/pill-avatars 
Message editing: render avatars for pills in the editor
 2019-05-21 12:11:06 +00:00
Bruno Windels
e48e72c162 pr feedback 2019-05-21 13:50:27 +02:00
Bruno Windels
7c03d71607 give continued events a little bit of top padding 
this way, the background isn't clipped at the top
 2019-05-21 12:20:58 +02:00
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
Travis Ralston
52b0f285c6 Add some clarifying comments 2019-05-20 21:07:12 -06:00
Travis Ralston
3476be3327 Merge branch 'develop' into travis/feature/wellknown2 2019-05-20 19:50:02 -06:00
Matthew Hodgson
d3f06763b3
Merge branch 'develop' into matthew/twemoji 2019-05-20 16:38:44 +01: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
c1b2f3dce1 make user pill avatars work in editor 2019-05-20 14:21:25 +02:00
Matthew Hodgson
7b2602f1c7 apply monospace to pre 2019-05-20 10:09:19 +01:00
Bruno Windels
1368a5eb80
Merge pull request #2996 from matrix-org/bwindels/composerdesign 
Message editing: apply design
 2019-05-20 08:42:41 +00: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
Matthew Hodgson
dbc6815abf make EmojiProvider and stripped-emoji.json work 2019-05-19 20:48:18 +01:00
Matthew Hodgson
e48cc44cba apply monospace font correctly 2019-05-19 17:41:18 +01:00
Matthew Hodgson
069a5a9546 remove obsolete emojione css 2019-05-19 17:11:41 +01:00
Matthew Hodgson
24b03374ac moar lineheight needed for big twemoji 2019-05-19 16:48:29 +01:00
Matthew Hodgson
dc72641264 replace emojione with twemoji. completely untested & debugged & unoptimised 2019-05-19 15:23:43 +01:00
Travis Ralston
47add75278 Add class to hide focus highlight 
We use tabIndex to make elements selectable and therefore focused by screen readers. Doing this draws a blue border (in chrome at least) around the element - in some cases, we don't want this.
 2019-05-17 15:25:17 -06:00
J. Ryan Stinnett
3a405701a3 Debug: Show all events 2019-05-17 16:34:01 +01: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
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
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
J. Ryan Stinnett
43c9e6d942 Reactions / editing tooltip tweaks 2019-05-17 15:10:35 +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
Bruno Windels
4a6725d4c2 Message editing: show (edited) marker on edited messages, with tooltip 2019-05-17 11:36:36 +01:00
Michael Telatynski
d7c6869188 Apply Flex voodoo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-16 21:55:17 +01:00
Travis Ralston
0c7aa39273 Merge branch 'develop' into travis/feature/wellknown2 2019-05-16 12:59:50 -06:00
Travis Ralston
60a13652df
Merge pull request #2965 from matrix-org/travis/wk/tooltip 
Render underlines and tooltips on custom server names in auth pages
 2019-05-15 14:13:44 -06:00
Will Hunt
2994d99378
Merge branch 'develop' into hs/custom-notif-sounds 2019-05-15 16:09:55 +01:00
Bruno Windels
52c4d7b6b0 fixup edit icon 2019-05-15 15:53:02 +01:00
Will Hunt
d752de0972 Improve UX 2019-05-15 15:52:42 +01:00
Bruno Windels
edc100163f
Merge pull request #2952 from matrix-org/bwindels/message-edit-editor 
Initial support for editing messages
 2019-05-15 09:23:01 +00:00
Bruno Windels
22533ba2d4 use theme var for bg color 2019-05-15 10:12:16 +01:00
Bruno Windels
6b932d58e6 remove cruft from edit icon 2019-05-15 10:10:29 +01:00
Bruno Windels
d83e278f6b PR feedback, cleanup 2019-05-15 09:46:08 +01:00
J. Ryan Stinnett
1421e8e06b Tweak reply arrow and hover color 2019-05-15 09:12:53 +01:00
Michael Telatynski
9b40913838
Merge pull request #2957 from matrix-org/t3chguy/invite_perms 
Check permission to invite before showing invite buttons/disable them
 2019-05-14 23:15:59 +01:00
Michael Telatynski
fd07b5c476 use scss variable for grey 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-14 23:03:02 +01:00
Will Hunt
277c4ab809
Merge branch 'develop' into hs/custom-notif-sounds 2019-05-14 21:07:03 +01:00
Will Hunt
626cb46915 Cleanup interface buttons 2019-05-14 21:05:22 +01:00
Travis Ralston
4c1ac38dd4 Merge branch 'develop' into travis/feature/wellknown2 2019-05-14 10:53:01 -06:00
J. Ryan Stinnett
a2e0dc2f7e Tweak message action bar position 
This moves the message action bar up slightly to avoid covering message text.
 2019-05-14 16:52:02 +01:00
Bruno Windels
759a4a54ef send the actual m.replace event from composer content 2019-05-14 15:38:16 +01:00
Bruno Windels
c98e716cbd some pill styling 2019-05-14 15:38:16 +01:00
Bruno Windels
4ff37ca046 don't show model for now 2019-05-14 15:38:16 +01:00
Bruno Windels
fc87a27c5d make editor nicer 2019-05-14 15:38:16 +01:00
Bruno Windels
317e88bef2 initial hacky hookup of Autocomplete menu in MessageEditor 2019-05-14 15:38:16 +01:00
Bruno Windels
ebdb9fcb9c don't collapse whitespace in editor 2019-05-14 15:38:16 +01:00
Bruno Windels
76bb56a2bf initial hookup editor code with react component 2019-05-14 15:38:16 +01:00
Bruno Windels
6599d605cd wire up editor component (somewhat hacky) 2019-05-14 15:38:16 +01:00
Travis Ralston
e4576dac28 Render underlines and tooltips on custom server names in auth pages 
See https://github.com/vector-im/riot-web/issues/9290
 2019-05-13 17:16:40 -06:00
Travis Ralston
83737654ff Merge branch 'develop' into travis/feature/wellknown2 2019-05-13 09:20:10 -06:00
J. Ryan Stinnett
f5aa32bc96
Merge pull request #2954 from matrix-org/jryans/aggregations 
Send and undo reaction events
 2019-05-13 15:20:28 +01:00
Michael Telatynski
3cd9c152c2 Check permission to invite before showing invite buttons/disable them 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-11 19:45:24 +01:00
Travis Ralston
6a941aca91
Merge pull request #2941 from matrix-org/travis/guests/block-ui 
Use validated server config for login, registration, and password reset
 2019-05-10 11:21:21 -06:00
J. Ryan Stinnett
6a3708d51b Disable select for reaction buttons 2019-05-10 18:09:32 +01:00
Michael Telatynski
cd5a460b2b Iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-09 22:30:45 +01:00
Michael Telatynski
16c027dc61 Merge branches 'develop' and 'devtools_serverlist' of github.com:matrix-org/matrix-react-sdk into devtools_serverlist 2019-05-09 22:27:37 +01:00
J. Ryan Stinnett
576241236c Extract ReactionDimension out of MessageActionBar 
The reactions bits were cluttering up `MessageActionBar` so they have now been
extracted to a separate component.
 2019-05-08 13:53:41 +01:00
Travis Ralston
636cb8a5cc Have ServerConfig and co. do validation of the config in-house 
This also causes the components to produce a ValidatedServerConfig for use by other components.
 2019-05-03 11:32:59 -06:00
J. Ryan Stinnett
87f737b8a3 Increment an existing reaction 
This allows you to increment an existing reaction below a message by clicking on
it.

At the moment, this is not linked to the action bar, so they each are using
local state. We'll likely want to add some mechanism so that we can local echo
to both of these UI areas at the same time, but that can be done separately.

Fixes https://github.com/vector-im/riot-web/issues/9486
 2019-05-02 12:05:17 +01:00
J. Ryan Stinnett
15c5893278 Display existing reactions below the message 
This displays the existing reactions a message has from all users below the
message.

Since we don't currently have an API to actually get these events yet,
adds a temporary hook that looks for a specific message to inject some sample
data. This helps build out the UI for now and can be removed once it exists.

Fixes https://github.com/vector-im/riot-web/issues/9573
 2019-05-02 12:05:17 +01:00
J. Ryan Stinnett
784599d9e9 Add primary reactions to action bar 
This adds the primary reactions to the action bar. They act as toggles where you
can only select one from each group at a time.

Note that currently we aren't actually sending the reaction at all. That's left
for a separate task.

Fixes https://github.com/vector-im/riot-web/issues/9576
 2019-04-30 18:09:10 +01:00
J. Ryan Stinnett
4b50d2a2bf Update action bar colors for dark theme 
In addition, this also adjusts the event hover colors to match the palette.

Fixes https://github.com/vector-im/riot-web/issues/9591
 2019-04-30 17:42:17 +01:00
J. Ryan Stinnett
739c8c0314 Promote reply button up to message action bar 
This moves the reply action out of the existing options menu and up to the
message action bar for easier access.
 2019-04-29 15:53:03 +01:00
J. Ryan Stinnett
8ef9fe951d Update styling of message action bar for multiple buttons 
This applies the new design for multiple buttons in the message action bar,
paving the way for more things to appear here.

In addition, this changes the existing options button to use the three vertical
dots icon. Some theme colors are also tweaked to align with what they were meant
to be from the unified palette.
 2019-04-29 15:20:51 +01:00
J. Ryan Stinnett
ed8bbc7082 Extract message options button to action bar 
This adds a new action bar component to hold multiple per-message actions. This
existing options button has moved to this new component, and is currently the
only action.
 2019-04-29 15:20:50 +01:00
J. Ryan Stinnett
530c92e03d Rename event edit button to options button 
This naming is clearer as it doesn't really edit at all (it shows a context
menu). This should also be less confusing with actual editing when it arrives.
 2019-04-29 15:20:50 +01:00