mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
26575 commits 214 branches 561 tags 414 MiB
Commit graph

1593 commits

Author SHA1 Message Date
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
Michael Telatynski
cd2f323002 re-add text-align center 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 23:18:33 +01:00
Michael Telatynski
a5a32cb5de 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 23:14:10 +01:00
Michael Telatynski
646c5d4a64 Replace timeline tooltips to match breadcrumb tooltips 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 23:14:00 +01:00
Nad Chishtie
ce365cc5a1 Optically align room header height with panel heights 2020-07-13 23:12:37 +01:00
Nad Chishtie
b10195cefa Use consistent values between right and left panels 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
de46c0091f Fix UserInfo separator colour to match User Menu context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 22:50:18 +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
Michael Telatynski
33422f1744 Switch out Labs spinner to be the Flow-generated from Design 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 17:39:57 +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
David Baker
503159c1c8 Merge branch 'dbkr/in-app-rebrand-prompt' into 'element' 
Add in-app rebranding toasts & prompts

See merge request new-vector/element/element-web/matrix-react-sdk!1
 2020-07-10 17:09:17 +00: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
David Baker
8701e9293e Add in-app rebranding toasts & prompts 
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
 2020-07-10 15:32:34 +01:00
J. Ryan Stinnett
ab51dd28dc Merge remote-tracking branch 'origin/develop' into element 2020-07-10 11:08:33 +01:00
Bruno Windels
f2f813c43c make tag panel context menu icons follow text color 2020-07-10 10:20:26 +02: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