OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
26,658 Commits
223 Branches
563 Tags
445 MiB
Commit Graph

677 Commits (729fd6fa2d0eb77345ecf00817bd42c32113a179)

Author SHA1 Message Date
Bruno Windels 2da7d17a5d change color of who is typing text to composer icons color 
as requested by Nad
 2020-07-14 20:45:14 +02:00
Bruno Windels aeadf64ccf change icon on invite button 2020-07-14 19:40:17 +02:00
Bruno Windels 7ff3e6a26d bring back padding between show more and resize handle 2020-07-14 15:09:53 +02:00
Bruno Windels b6a5fa38e1 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux' 
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
 2020-07-14 12:40:52 +00:00
Bruno Windels 4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02: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
J. Ryan Stinnett a09f773edd Tweak sticky header hiding to avoid pop 
When transitioning between sublists, there can be a visibly observable jump in
the positioning of list items when the header container is restored to normal
size outside of sticky mode.

To avoid this problem, this leaves all headers at normal size. This creates a
new issue of a permanent gap at the top of the list for the first header, but
this can be solved by always hiding (since it can only ever appear stuck to
top).

Fixes https://github.com/vector-im/riot-web/issues/14429
 2020-07-14 12:16:17 +01:00
Bruno Windels 106c91aec0 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux' 
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
 2020-07-14 09:26:04 +00:00
Michael Telatynski 9d7a7c707f Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-14 00:52:07 +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
Nad Chishtie d0d61e7e3c Improve legibility of room headers 2020-07-14 00:06:12 +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
Nad Chishtie ce365cc5a1 Optically align room header height with panel heights 2020-07-13 23:12:37 +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 a1ff00a7a8 Fix scrollbar occlusion in the right panel 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 22:13:29 +01:00
Michael Telatynski 5e5620a6c2 Make widgets match the new 8px border-radius standard 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 21:59:46 +01:00
Nad Chishtie f8e2805f38 Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-13 21:53:46 +01:00
Nad Chishtie 9007653ec6 Make room clipping list mask softer 2020-07-13 21:52:52 +01:00
Michael Telatynski 6a58512397 Fix alignments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 21:45:48 +01:00
Michael Telatynski 88a653445f Fix h-alignment of the room header, timeline and composer avatars 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 21:15:58 +01:00
Michael Telatynski 57f75736be Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-13 21:02:26 +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 fafbd25f6b Tweak padding & weight 2020-07-13 20:57:24 +01:00
Nad Chishtie a3b1c93149 Tweak padding 2020-07-13 20:50:26 +01:00
Michael Telatynski 69929134c5 add spacing between sublists of 4px 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 20:40:42 +01:00
Michael Telatynski 4244c67aca Fix even spacing between sticky and non-sticky headers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 20:29:08 +01:00
J. Ryan Stinnett b50c809d35 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 20:28:57 +01:00
J. Ryan Stinnett 571209afbe
Merge pull request #4963 from matrix-org/joriks/room-list-gradient 
Add fade to show more button on room list
 2020-07-13 20:21:48 +01:00
Nad Chishtie dec377a448 Temporarily apply Joriks CSS fix 2020-07-13 20:15:09 +01:00
Nad Chishtie b28bb34cb7 Small tweaks to padding and sizing 2020-07-13 20:13:20 +01:00
Jorik Schellekens c9e231c3eb Add fad 2020-07-13 19:03:31 +01:00
J. Ryan Stinnett 995a7879a1 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 18:49:55 +01:00
Bruno Windels c346122adf align room header with user menu button 2020-07-13 18:24:28 +02:00
Jorik Schellekens cd83f12a82 Fix badges for font size 20 2020-07-13 16:11:21 +01:00
Michael Telatynski 1ce3ae0cf2
Merge pull request #4952 from matrix-org/t3chguy/room-list/14413 
Remove redundant scroll-margins and fix RoomTile wrongly scrolling
 2020-07-13 15:57:27 +01:00
Michael Telatynski 213e2df9fc Remove redundant scroll-margins and fix RoomTile wrongly scrolling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-12 08:49:04 +01:00
Travis Ralston bdb641279a Merge branch 'develop' into travis/room-list/enable 2020-07-10 11:11:25 -06:00
Bruno Windels 952200f031 Merge branch 'develop' into element 2020-07-10 19:04:45 +02:00
Travis Ralston 477472c178 Merge branch 'develop' into travis/room-list/showmore2 2020-07-10 10:57:17 -06:00
Bruno Windels 85ac256231 cleanup 2020-07-10 18:40:09 +02:00
Bruno Windels 725b7f8950 make show more button a bit less tall 2020-07-10 18:30:52 +02:00
Bruno Windels d5a3071518 put show more button inside resizer 
this way we have a flexbox layout in the resizer with:
 - the resize handle (fixed)
 - the show more/less button, if any (fixed)
 - the list of tiles (grabbing whatever is left)
 2020-07-10 18:29:39 +02:00
Travis Ralston bf0a503e44 [WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable 2020-07-10 10:18:12 -06:00
Travis Ralston 2bf2a08e7a Mark safari hacks 2020-07-10 08:52:46 -06:00
J. Ryan Stinnett ab51dd28dc Merge remote-tracking branch 'origin/develop' into element 2020-07-10 11:08:33 +01:00
Travis Ralston 75dbd5f1d4 Merge branch 'develop' into travis/room-list/enable 2020-07-09 22:28:16 -06:00
Jorik Schellekens edb556f22e Stop safari from agressivly shrinking 2020-07-10 02:15:46 +01:00
Travis Ralston 859f65659c Attempt to support a hard cutoff with the show more button 
Known issues:
* Causes scroll jumps when the button gets added to DOM
* Resize handle is invisible when there's a show more button

TODO:
* Clean up comments
* Clean up useless code (all the padding stuff isn't needed)
 2020-07-09 13:07:13 -06:00
Bruno Windels ce68314de9 Revert "Merge pull request #4932 from matrix-org/travis/room-list/invisible-show-more" 
This reverts commit f58a0a7538.
 2020-07-09 12:13:12 -06:00