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
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
Bruno Windels
3d9e631d18
no space in !important
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-05-22 09:35:09 +00: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
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
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