OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
13,326 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

170 Commits (2db0a9c005c739a6dbded4bc298912a36f778c0c)

Author SHA1 Message Date
David Baker 2d61a2508d
Merge pull request #2514 from matrix-org/bwindels/roomlistjslayout-bis 
Redesign: new roomlist layout fixes
 2019-01-28 15:53:28 +00:00
Bruno Windels 79a44b1bfb always hide overflow on RoomList in case Layout screws up 2019-01-28 16:03:49 +01:00
Bruno Windels 55e0838c82
Merge pull request #2507 from matrix-org/bwindels/roomlistjslayout 
Redesign: new layout algorithm for room sublists.
 2019-01-28 14:55:31 +00:00
Bruno Windels a5297303b0 remove flexbox layout 2019-01-24 15:44:16 +01:00
Christopher Medlin be94e1aebc Fix integrations error popup 
Signed-off-by: Christopher Medlin <christopherjmedlin@protonmail.com>
 2019-01-22 11:44:55 -08:00
Bruno Windels 5dd5f4f1dc add JumpToBottomButtom component 2019-01-22 14:49:04 +01:00
J. Ryan Stinnett 20e296b20e Convert image URLs in React to `require` calls 
This allows Webpack to insert the proper image URL after builds steps like
adding a hash and so on. The path you supply to `require` is relative to the JS
source file, just like any other would be.
 2019-01-17 22:06:49 -06:00
J. Ryan Stinnett b2387f4cff Define SCSS variable for resource dir 
Adds a `$res` SCSS variable set to the path from the root SCSS file to the `res`
directory.

This is a different base path than previously used in CSS URLs (it goes up 3
directories instead of 2), because Webpack will now be resolving images relative
to the root SCSS file, so the path corresponds to a source tree location,
instead of a path in the build output tree.

Defining this variable has two main goals:

* URLs are a bit easier to read
* The path can be overridden, which is needed for external (riot-web) themes
 2019-01-17 22:06:49 -06:00
Bruno Windels 921906897f css url paths are relative to location of compiled file, not project structure 2019-01-17 13:49:52 +01:00
Bruno Windels 89b576936b
Merge pull request #2448 from matrix-org/bwindels/searchmakeover 
Redesign: search makeover
 2019-01-17 12:12:26 +00:00
Bruno Windels 8c30d05eb8 Revert "Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental" 
This reverts commit ece5cb1fcc, reversing
changes made to 64a3d2521c.
 2019-01-17 10:29:37 +01:00
Matthew Hodgson 1082f548d3 hack nunito italics for now with CSS skew 
fixes https://github.com/google/fonts/issues/1726
 2019-01-16 12:53:46 +00:00
Bruno Windels 899ee265e3 Merge branch 'experimental' into bwindels/searchmakeover 2019-01-16 11:17:38 +01:00
Bruno Windels b14d436e98 make cancel button icon slightly larger 2019-01-16 11:14:19 +01:00
J. Ryan Stinnett eae1e4c9aa Tweak custom status avatar ring 
Adjusts the appearance of the avatar ring to match the latest comps.

In addition, we now always render the surrounding button element, which
simplifies styling since the same size is now occupied both with and without the
feature.

This improves alignment between text in the composer and text in the message
history (https://github.com/vector-im/riot-web/issues/8111).
 2019-01-15 10:54:29 -06:00
J. Ryan Stinnett 7d6b996952 Tweak composer button padding so it won't affect status 2019-01-15 10:54:29 -06:00
Bruno Windels 77a62b9174 style search bar 2019-01-15 16:20:04 +01: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