Commit graph

236 commits

Author SHA1 Message Date
Germain Souquet
8da2d0fe72 Fix avatar obstructing membership and state changes 2021-07-22 11:31:46 +02:00
Travis Ralston
fd9241a854
Merge pull request #6355 from SimonBrandner/fix/diff-colors
Make diff colors in codeblocks more pleasant
2021-07-21 20:02:03 -06:00
Germain
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099 2021-07-21 11:57:29 +01:00
Germain
e33163c837
Merge pull request #6419 from matrix-org/gsouquet/fix-18125
Add spoiler support for message bubbles
2021-07-21 11:54:30 +01:00
Germain
6308dabcfe
Remove forgotten code comment 2021-07-21 10:43:48 +01:00
Germain Souquet
ef002a2e22 Fix replies line clamping 2021-07-21 11:41:52 +02:00
Germain Souquet
fee69884a6 Reintroduce grouped events padding on modern layout 2021-07-21 08:57:09 +02:00
Germain Souquet
a6308229fb Add spoiler support for message bubbles 2021-07-21 08:42:42 +02:00
Šimon Brandner
9e5b149291
Fix event highlighthing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 14:23:28 +02:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Germain Souquet
fc270b435c fix group layout 2021-07-14 15:32:35 +02:00
Germain Souquet
290174b031 fix group layout and IRC layout regressions 2021-07-13 10:36:35 +02:00
Germain Souquet
ba3e7e24ba Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-13 10:15:27 +02:00
Šimon Brandner
4ddcb9a484
Make diffs look a bit better
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 16:59:16 +02:00
Šimon Brandner
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-07-08 13:30:57 +02:00
Germain Souquet
55896223aa unbubble some type of events 2021-07-07 15:13:58 +02:00
Germain Souquet
7d946ee0db Restore action bar 2021-07-07 12:04:28 +02:00
Šimon Brandner
9d12439ee7
Give codeblocks a background color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:56 +02:00
Šimon Brandner
8c1721fc35
Remove the old codeblock code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:50 +02:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
Germain Souquet
209344d443 improvements to bubble layout 2021-06-30 17:06:51 +01:00
Germain Souquet
d1c6cfe6b9 Improved message bubble layout (no reply) 2021-06-30 12:06:16 +01:00
Germain Souquet
d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01:00
Michael Telatynski
5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
Germain Souquet
6271c5c3d8 first iteration for message bubble layout 2021-06-18 18:59:22 +01:00
Šimon Brandner
707ecd8786
Don't highlight bubble events
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:03:48 +02:00
Šimon Brandner
5343be7814
Fix buggy hovering/selecting of event tiles
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 18:53:56 +02:00
Robin Townsend
ea2120bdfd Fix timestamps
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 01:55:01 -04:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
J. Ryan Stinnett
234c65b331 Tweak event border radius to match action bar
This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066).
2021-06-02 10:25:29 +01:00
Germain Souquet
18188538f6 Move the read receipt animation to the compositing layer 2021-05-28 14:59:54 +01:00
Travis Ralston
c5dd6b4dfb Update action bar to incorporate sending states
This moves most of them out of the context menu.
2021-04-21 16:24:17 -06:00
Germain
36e729a626
Merge pull request #5836 from matrix-org/gsouquet-readreceipts-animation 2021-04-15 08:27:28 +01:00
Germain Souquet
2aebf103ed always display message timestamp in IRC layout replies 2021-04-13 11:20:53 +01:00
Germain Souquet
1d75726a75 Honour prefers reduced motion for read receipts 2021-04-08 11:05:45 +01:00
Germain Souquet
8d60d85570 replace velocity-animate with CSS transitions 2021-04-08 10:36:14 +01:00
Travis Ralston
9cec382865 Change sending->sent state to match new designs
For https://github.com/vector-im/element-web/issues/16424
2021-03-01 16:25:19 -07:00
Travis Ralston
dee7c7b556
Merge pull request #5567 from SimonBrandner/fix-read-receipts
Fix read receipts?
2021-02-24 11:21:42 -07:00
Šimon Brandner
3f0e8e4afc
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 19:16:52 +01:00
Šimon Brandner
64945d4ccf
Add a comment and use rems
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 19:14:36 +01:00
Šimon Brandner
2f2c5c9081
Merge branch 'develop' into fix-read-receipts 2021-02-23 18:43:58 +01:00
Šimon Brandner
7dc6029f19
Move icons
This tweaks the icon positions to look a bit better. Espacially with a scrollbar on the side

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-13 15:29:38 +01:00
Šimon Brandner
e2bf0c84d7
Move icons to the left
We do this because they would otherwise collide with the scrollbar

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 08:16:36 +01:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner
257b8819b3
Change icon size
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:30 +01:00
J. Ryan Stinnett
a4318299ff
Merge pull request #5601 from weeman1337/fix-16325-timestamp-jump
Fix jumping timestamp if hovering a message with e2e indicator bar
2021-02-04 16:02:18 +00:00
Šimon Brandner
b8ee23cdf4
Make consistent for all events
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 18:41:09 +01:00
Šimon Brandner
9a131efc1a
Fix avatar alignment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 08:16:07 +01:00
J. Ryan Stinnett
388e23b40b Fix flair height after accent changes
The accent changes in https://github.com/matrix-org/matrix-react-sdk/pull/5569
led to a regression in flair display where the bottom edge was clipped.

Fixes https://github.com/vector-im/element-web/issues/16350
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5569
2021-02-02 17:57:22 +00:00
Michael Weimann
9b54aba4c0
fix timestamp width if there is a 2e2 indicator bar
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-01-31 11:11:34 +01:00
Šimon Brandner
90ad3360b6
Fixed read receipts?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-24 09:15:11 +01:00
Šimon Brandner
5ca9e8d323
Remove spaces
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 18:18:07 +01:00
Šimon Brandner
bd2423a52c
Added line numbering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 10:53:18 +01:00
Šimon Brandner
14bf169631
Handle small codeblocks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 15:01:23 +01:00
Šimon Brandner
19be3293e0
Remove commented code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:06:08 +01:00
Šimon Brandner
58b2c18cf5
This somehow works
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 21:02:39 +01:00
Šimon Brandner
e6ab47ff76
Fix bug
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 17:30:02 +01:00
Šimon Brandner
61281a855c
Redo expanding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 16:35:32 +01:00
Šimon Brandner
49dce58027
Added expanding based on the option
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-18 17:49:09 +01:00
Michael Telatynski
80bb091cc5 Iterate PR 2020-11-10 10:00:55 +00:00
Michael Telatynski
0a42853a25 Fix centering of bubble event tile 2020-11-05 15:39:37 +00:00
Michael Telatynski
ff25a9b45d Consolidate all EventTile bubble stuff into its own component and use it for the room continuation plinth 2020-11-04 17:06:38 +00:00
Travis Ralston
b177843e45 Remove defunct "always show encryption icons" setting
It doesn't do anything in practice.

Fixes https://github.com/vector-im/element-web/issues/8725
2020-09-14 22:03:54 -06:00
Jorik Schellekens
d55699211e Update copy icon on pre block and share dialogues 2020-07-27 15:13:02 +01:00
Michael Telatynski
519ebdb67a Update crypto event icon to match rest of app styling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 14:05:07 +01:00
Travis Ralston
17dba01993 Fix style lint 2020-07-15 03:49:59 -06:00
Michael Telatynski
fcf5fc0990 Fix normal e2e icon colour
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 13:30:05 +01:00
Michael Telatynski
d4e397cbd0 Switch to svg masks for the e2eicon and border it for the EntityTile avatars
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 00:52:03 +01:00
Michael Telatynski
4d432f23e4 Fix room header timeline and composer alignment
Room header use DecoratedRoomAvatar instead of manual e2eIcon overlay
move e2eIcon next to it instead of private padlock

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:56:25 +01:00
Michael Telatynski
145b154a01 fix left gutter based on the border-left shrinking by 1px
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:56:20 +01:00
Michael Telatynski
a40972cec9 Fix text jumps for event tile hover
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:21:06 +01:00
Michael Telatynski
5a85ce5d3d Remove text decoration from links v2
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:02:08 +01:00
Nad Chishtie
b28bb34cb7 Small tweaks to padding and sizing 2020-07-13 20:13:20 +01:00
Hubert Chathi
74e4ea7d48
Merge pull request #4797 from matrix-org/uhoreg/distrust_backup
Mark messages with a black shield if the megolm session isn't trusted
2020-06-23 15:38:03 -04:00
Hubert Chathi
c690cfc6c5 mark messages with a black shield if the megolm session isn't trusted 2020-06-18 21:57:33 -04:00
Jovan Gerodetti
af1c2f9b29 fix requested changes from #3991
Signed-off-by: Jovan Gerodetti <jovan.gerodetti@titannano.de>
2020-06-16 23:11:32 +02:00
Dale Harvey
049e3fc08c Add some media queries to improve UI on mobile 2020-06-16 23:11:32 +02:00
David Baker
ef4d0a8051 Make linter happy 2020-05-22 10:33:19 +01:00
Travis Ralston
a425c5440b Fix visibility of message timestamps
Fixes https://github.com/vector-im/riot-web/issues/13736

This also fixes an unreported but complained about issue regarding the 'always show timestamps' option not working.

Looks like this regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4531 when things got shuffled around.
2020-05-21 16:34:23 -06:00
Jorik Schellekens
2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00
Jorik Schellekens
17f535e5f8 Fix review problems
- removed superfluous position and classes
- fixed compact view
- fixed event list summary avatar and text overlap
- fixed a problem where the mention list refuses to load.
2020-05-18 16:37:10 +01:00
Jorik Schellekens
c1e740a596 Break out group layout settings 2020-05-07 14:04:33 +01:00
Michael Telatynski
f0085a9feb Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-05-07 09:56:21 +01:00
Michael Telatynski
c00b070269 Fix reply RR spacing getting doubled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-03 13:28:16 +01:00
Jorik Schellekens
cf05beb4b8
Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes
Fix scaling issues
2020-04-28 13:47:50 +01:00
Michael Telatynski
9dd204dd10 Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-04-27 23:09:08 +01:00
Michael Telatynski
da7a2f2f62 only clear on continuations where the clear isn't done by SenderProfile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 17:50:50 +01:00
Jorik Schellekens
5113723154 Fix avatar alignment for room state events 2020-04-27 11:51:54 +01:00
Jorik Schellekens
e03442048c Scale read receipt images 2020-04-27 11:51:54 +01:00
Jorik Schellekens
92005b15d8 Fix event tiles to smoothly resize with font. 2020-04-27 11:51:54 +01:00
Michael Telatynski
e16f511527 Redesign redactions
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-24 15:07:39 +01:00
Zoe
e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Michael Telatynski
60808ef6d2 apply clear:both to fix automatic margins for continuation events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-09 13:36:53 +01:00
Zoe
1395cb02ed Fixup alignment 2020-04-06 11:44:46 +01:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Jorik Schellekens
3ed457ea7d
Merge pull request #4305 from JorikSchellekens/joriks/font-scaling
Make all 'font-size's and 'line-height's rem
2020-04-02 17:40:39 +01:00
Jorik Schellekens
6cf9166c4a Use variables for the rem values.
It's become obvious that these random floating points everywhere
are unwieldy. Now they're all in one place with some fairly logical
variable names which will help out in design->implementation phase.
2020-03-31 15:26:23 +01:00
Michael Telatynski
9e8a401dc8 Fix EventListSummary when RR rendering is disabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 12:29:58 +01:00
Jorik Schellekens
da34e6241d Make all 'font-size's and 'line-height's rem
Font size of the whole app would ideally be controlled by a single
value. This value is currently hard coded using the :root CSS selector.
It is the intention to make this value configurable within riot. In the
interim all font-sizes have been converted to rem by the simple process
of regex. Replacing px values with their equivalent rem values assuming
a font size of 15px and then rounded to three decimal places, which was
the base at the time of this transformation.

I'm expecting another commit cleaning up rem values but I thought it
best to leave that to review.

This commit doesn't address any scaling issues. I thought it better to
land this unwieldy, mechanical, invisible change before the others
otherwise the pr would be impossible to review thoroughly.
2020-03-30 18:23:46 +01:00
Zoe
04849f7f0d incorporated design feedback 2020-03-26 13:47:32 +00:00