Commit Graph

154 Commits (7d6b996952e2982f461fcc6e974beab51c484e27)

Author SHA1 Message Date
J. Ryan Stinnett 7d6b996952 Tweak composer button padding so it won't affect status 2019-01-15 10:54:29 -06:00
Erik Johnston cbf9ff6aee Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters 2019-01-10 16:56:47 +00:00
Bruno Windels ece5cb1fcc
Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental
Tiled room UI
2019-01-09 17:25:08 +00:00
J. Ryan Stinnett f60a865727 Restore room name ellipsis on overflow
Fixes vector-im/riot-web#8037.
2019-01-07 14:12:32 -06:00
Erik Johnston 9a5f17d0b1 Change CSS to match experimental 2019-01-07 15:21:00 +00:00
Erik Johnston 8a6e7382ae Missing newline 2019-01-07 13:52:13 +00:00
Erik Johnston 712241d710 Add simple state counters to room heading 2019-01-07 13:52:13 +00:00
Bruno Windels 290dc9d8fb Merge branch 'experimental' into bwindels/roomgridview-experimental 2019-01-07 14:17:57 +01:00
J. Ryan Stinnett a7c9d4ea1f Use same link style in HTML messages
Links in HTML messages were missing the usual underline style, making them
look different from links in text messages (which already do this).

Fixes vector-im/riot-web#4655.
2019-01-04 18:32:43 -06:00
Travis Ralston 93ea9d3617 Condense .mx_RoomTile_avatar properties
Looks like the develop->experimental merge duplicated the definition. We'll take the best of both and make it work.
2019-01-03 18:07:34 -07:00
Travis Ralston 51dc1fe9bf Fix badges on room tiles not being right aligned
Thanks to Ryan for fixing this!

Problem: https://t2l.io/_matrix/media/v1/download/t2l.io/da6fccb60969da1c455630faae990881
2019-01-03 18:05:59 -07:00
J. Ryan Stinnett 920911c0a1 Room list fixes for custom status 2019-01-03 18:49:15 -06:00
Travis Ralston 8017f0a4a1 Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real 2019-01-03 16:00:23 -07:00
David Baker f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
This reverts commit ad47144355.
2019-01-03 15:37:03 -07:00
David Baker 7d161de35b Partial merge of develop to experimental
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +00:00
Nad Chishtie 09bf68b1bd Improved colours. 2018-12-20 12:46:43 +00:00
Nad Chishtie 42c8d43065 Lint. 2018-12-20 11:35:58 +00:00
Nad Chishtie 9b8f07c19f Don't override text colour of selected room in room list. 2018-12-20 11:35:43 +00:00
Nad Chishtie d7473c4f4d Various colour, contrast and legibility improvements. 2018-12-20 11:35:21 +00:00
Travis Ralston a1347add95 Merge branch 'develop' into travis/custom-status 2018-12-19 10:33:34 -07:00
Bruno Windels 8b406eab3b
Merge pull request #2371 from matrix-org/bwindels/rmdot
Redesign: add badge with dot to rm button, to see it catches your eye better
2018-12-19 09:49:19 +00:00
Travis Ralston ef60a34180 Clean up and follow code style 2018-12-18 10:53:37 -07:00
Bruno Windels 2ad9f45655 add badge with dot to rm button, so it catches your eye better 2018-12-18 17:56:05 +01:00
Nad Chishtie 074c96cd3e First pass of normalising icons. 2018-12-18 16:48:20 +00:00
Bruno Windels 0496ed535c have a bit more space between rooms 2018-12-17 14:35:11 +01:00
Bruno Windels 242b0c21ac make avatar 24px and tile height 32px 2018-12-17 14:03:48 +01:00
Bruno Windels 6c1639b2ce dont hardcode avatar container dimensions 2018-12-17 14:03:28 +01:00
Bruno Windels 2afdb04db5 prevent jumping on when hovering over invited section 2018-12-14 17:05:01 +01:00
J. Ryan Stinnett 15366fbb0a Change room recovery reminder button style
Change the button to a transparent background so that it's less prominent and
you focus on the primary button instead.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-13 16:36:55 +00:00
Bruno Windels f593bff3c3 show right panel tabs inside panel instead of room header in grid mode 2018-12-13 13:01:59 +01:00
Travis Ralston cd9ea2b2d7 Fix alignment of avatars and status messages
also introduce the status message to the MemberInfo pane

Part of https://github.com/vector-im/riot-web/issues/1528
2018-12-12 12:57:48 -07:00
Bruno Windels 9f5a0250bf
Merge pull request #2345 from matrix-org/bwindels/jumptofirstunread-rebased
Redesign: restyle jump to first unread message & rework read marker logic (rebased)
2018-12-12 10:13:51 +00:00
Travis Ralston ce7969e3d5 Display custom status messages in the UI
Part of https://github.com/vector-im/riot-web/issues/1528
2018-12-11 21:40:11 -07:00
Bruno Windels ac9902e52a apply redesign to topunreadmessagebar
with placeholder for message count
2018-12-11 15:43:00 +01:00
Bruno Windels d3f655a064 fix avatar in edit mode 2018-12-11 13:11:26 +01:00
Bruno Windels 93767fa5f1 fix invite button layout 2018-12-10 17:46:22 +01:00
J. Ryan Stinnett a92d2902c4 Add an in-room reminder to set up key recovery
This adds an in-room reminder above the message timeline to set up Secure
Message Recovery so that your keys will be backed up. If you try to ignore it,
an additional dialog is shown to confirm.

Fixes vector-im/riot-web#7783.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-07 14:13:02 -06:00
Bruno Windels 8f4292399b
Merge pull request #2297 from matrix-org/bwindels/roomlistsizingimprovements
Redesign: improve room sub list sizing & persist sizes
2018-11-27 13:40:48 +00:00
Bruno Windels 887defda9c temp solution to make room settings usable
make mx_fadable not do anything anymore, and make room settings
full size.

Room settings haven't been designed yet, so all of this will
have a full pass when we have a go at it.
2018-11-26 17:58:51 +01:00
Bruno Windels 257bac2b09 unrelated fix for searchbox being squashed by other roomlist content 2018-11-26 14:50:53 +01:00
Bruno Windels 67e0030ccd Merge branch 'develop' into experimental 2018-11-26 13:10:29 +01:00
Bruno Windels 36bc83ce03 copyright 2018-11-14 10:05:53 +01:00
Bruno Windels 741e106565 update animation image and location 2018-11-13 18:30:14 +01:00
Bruno Windels ffc73c59b4 make padding and DOM more like event tile 2018-11-13 09:15:43 +01:00
Bruno Windels 20b8994714 simplify DOM and style to design 2018-11-12 18:19:18 +01:00
Bruno Windels 7df47cbc87 move typing notifications to WhoIsTypingTile, shown in ScrollPanel 2018-11-12 16:09:51 +01:00
J. Ryan Stinnett 13039b05b9 Align buttons in encrypted event dialog
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-11-08 17:17:57 +01:00
Bruno Windels 883126a528 Merge branch 'experimental' into bwindels/memberqueryfield 2018-11-07 13:29:28 +01:00
Bruno Windels 9e95a1402c
Merge pull request #2269 from matrix-org/bwindels/roomlistpolish
Redesign: room list visual polish
2018-11-07 11:44:47 +00:00
Bruno Windels 4e773c2665 Make right panel a dark-panel instead of every descendant.
Also move bg color central.
2018-11-06 14:47:58 +01:00