PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
33397 commits 1 branch 0 tags 338 MiB
Commit graph

915 commits

Author SHA1 Message Date
blattersturm
da7f6c7eca Don't use name width in reply thread for IRC layout 
Signed-off-by: Robert Dash <peachypies@protonmail.ch>
 2021-01-21 19:39:19 +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
f1a3240ec3
Merge branch 'develop' into improve-codeblock 2021-01-21 17:36:22 +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
Travis Ralston
c7c055dd98 Give a bigger target area to AppsDrawer vertical resizer 
The existing target was too hard to hit, which annoyed users. This change makes it the same sort of surface area as the horizontal resizers, as requested by design to fix the problem in the short term.
 2021-01-20 15:05:18 -07: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
Šimon Brandner
263f213650
Remove an empty line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:27:02 +01:00
Šimon Brandner
4538274e74
Added send message icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:25:29 +01:00
Šimon Brandner
d589c61000
Added send message button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:09:14 +01:00
David Baker
452fbb076b Add a dialpad UI for PSTN lookup 
Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user.
 2020-12-23 19:02:01 +00:00
Michael Telatynski
f2214c0367 Fix room list help prompt alignment 2020-12-17 10:43:53 +00:00
Miroslav Šedivý
018743a639
Update _MemberList.scss 2020-12-15 11:45:15 +01:00
Aaron Raimist
918326631f
fix lint 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-12-08 14:35:05 -06:00
Aaron Raimist
32f7e3552c
Remove globally defined flex and set just for group queries 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-12-05 21:56:17 -06:00
Travis Ralston
f2bc3db8fd Fix visual gap of sticker picker at bottom 
Fixes https://github.com/vector-im/element-web/issues/15690
 2020-11-26 15:09:44 -07:00
Travis Ralston
c62c0190c3 Merge branch 'develop' into patch-1 2020-11-18 15:31:39 -07:00
Michael Telatynski
3ee25dadd4 Shrink new room intro top margin to half for encryption bubble tile 2020-11-18 13:09:43 +00:00
Michael Telatynski
a481f3bdf1 Iterate the filtering prompt 2020-11-11 17:04:09 +00:00
Michael Telatynski
80bb091cc5 Iterate PR 2020-11-10 10:00:55 +00:00
Michael Telatynski
664079a127 Use MiniAvatarUploader for the new NewRoomIntro component 2020-11-05 15:50:42 +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
Michael Telatynski
fa9490b02b Add skeleton UI for Room List when no rooms 2020-11-02 17:22:45 +00:00
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
 2020-10-21 12:48:51 +01:00
Michael Telatynski
5a9bac68c6 iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 09:48:02 +01:00
Michael Telatynski
334ab12c47 Tidy up widget colouring 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 16:06:35 +01:00
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
 2020-10-19 20:50:16 +01:00
Michael Telatynski
06009df05b Update Widget paddings and background colours 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 18:47:15 +01:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Michael Telatynski
f198b95579 Iterate PR; tidy and improve widget context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 15:24:42 +01:00
Travis Ralston
43208c01a1 Fix variable naming 2020-10-14 16:30:38 -06:00
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Michael Telatynski
bb52bad099 Remove stale props and CSS classes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:23:49 +01:00
Michael Telatynski
447ea9eb23 Relax flexboxes in resizer on window resize 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:11:58 +01:00
Michael Telatynski
ba21c6ed36 Iterate on Widget icons and resizing handles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 15:56:53 +01:00
Michael Telatynski
7be5ff0fe6 First cut of app drawer tiled resizing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 12:29:12 +01:00
Michael Telatynski
f72b1e0c7d Remove stale things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 12:27:50 +01:00
Michael Telatynski
c1fef5a941 Improve the styling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 13:36:09 +01:00
Michael Telatynski
7820f9c28a Switch to WidgetAvatar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 13:16:55 +01:00
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
Michael Telatynski
ada6d1aa46 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 08:42:21 +01:00
J. Ryan Stinnett
576ea6df08 Use same colour variable as text 2020-10-08 10:01:05 +01:00
J. Ryan Stinnett
73ce2fac8a Add comment on colour 2020-10-08 09:56:58 +01:00
J. Ryan Stinnett
3d0db1b022 Change invite icon 2020-10-07 20:08:59 +01:00
Michael Telatynski
ab9b5b0d7b
Merge pull request #5265 from matrix-org/t3chguy/feat/widget-max-width 
Remove width limit on widgets
 2020-10-06 10:23:19 +01:00
Travis Ralston
a5569303d1 Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-29 10:20:02 -06:00
Travis Ralston
c75628844d
Merge pull request #5226 from matrix-org/travis/ft-sep1620/10-pip 
Make the PIP Jitsi look and feel like the 1:1 PIP
 2020-09-29 10:18:30 -06:00
Michael Telatynski
123dada465 Remove width limit on widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 14:49:02 +01:00
Travis Ralston
9df175212e Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-28 13:43:47 -06:00
Glandos
0dc5200b0e Push name to the end, near text, in IRC layout 
Currently, the name (and aux message) are align to the start, leaving a blank space between the end of the name and the message.

In a lot of IRC themes, names (and actions) are aligned to the end, next to the message, for a better readability.

Signed-off-by: Adrien CLERC <bugs-github@antipoul.fr>
 2020-09-23 21:44:30 +02:00
Michael Telatynski
7fd6d4498f Make bottom sticky room list header dynamic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-23 11:00:19 +01:00
Travis Ralston
870c35be6f Merge branch 'develop' into travis/ft-sep1620/09-enc-files 2020-09-18 10:56:20 -06:00
Travis Ralston
849a5e4a39 Round the jitsi pip corners 2020-09-17 14:58:48 -06:00
Travis Ralston
8129333dcc Make the PIP Jitsi look and feel like the 1:1 PIP 
* Similar sizing
* Fix pointers so the jitsi widget doesn't feel clickable when it's not
  * We might want to introduce click-to-visit-room for the Jitsi widget (like the 1:1 call), however the Jitsi widget has many more controls to worry about
* Remove the menu bar from the widget to avoid accidents
 2020-09-16 22:38:12 -06:00
Travis Ralston
bfbbf44dfc Add a note to use the desktop builds when seshat isn't available 
Fixes https://github.com/vector-im/element-web/issues/15184

This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
 2020-09-16 17:23:37 -06:00
Travis Ralston
1ffc6d5bd3 Make the hangup button do things for conference calls 
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
  * If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
  * If you're not able to modify widgets in the room, hang up.

For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
 2020-09-16 14:35:55 -06:00
J. Ryan Stinnett
26b465f1fd Remove room recovery reminder 
The Secure Backup toast replaces this with better UX.

Part of https://github.com/vector-im/element-web/issues/13895
 2020-09-16 15:03:06 +01: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
J. Ryan Stinnett
cd3aa81eed Fix sticker picker height 
Fixes https://github.com/vector-im/element-web/issues/15152
 2020-09-11 11:12:56 +01:00
Michael Telatynski
050319c0cc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-1px-jump 2020-09-09 17:37:50 +01:00
Nigel Mansell
421af52e76 Fixed 1px jump upwards on filter room members box 
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
 2020-09-08 15:29:16 -04:00
Michael Telatynski
31cca5e0f2 Create new right panel cards 2020-09-08 15:42:31 +01:00
Michael Telatynski
bf3c49b8df Remove redundant CSS rules 2020-08-27 10:46:29 +01:00
Michael Telatynski
dc08fee635 Fix the resize handle being unreachable when you don't have permission to add widgets 2020-08-24 14:38:58 +01:00
Michael Telatynski
35cc1fb06d small tweaks 2020-08-21 16:38:28 +01:00
Michael Telatynski
cca5ccd79d Switch widget resizing to re-resizable and add persistence 2020-08-21 16:29:07 +01:00
Michael Telatynski
ae65ed5c2e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer 
 Conflicts:
	res/css/views/rooms/_AppsDrawer.scss
 2020-08-20 10:26:35 +01:00
Michael Telatynski
24a390f840
Merge pull request #5123 from matrix-org/t3chguy/room-list/14466 
Room List filtering visual tweaks
 2020-08-18 17:22:05 +01:00
Bruno Windels
5d98805d77 Merge branch 'develop' into bwindels/make-reply-not-overlay 2020-08-18 13:39:06 +02:00
Michael Telatynski
24a088e234 Iterate PR, tweak margins 2020-08-18 12:00:56 +01:00
Michael Telatynski
3fe6f0a792 delint css 2020-08-17 18:26:42 +01:00
Michael Telatynski
e20b375433 Add filter results count and explore prompt 2020-08-17 18:20:00 +01:00
Michael Telatynski
21cdf5073c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617 2020-08-14 18:58:26 +01:00
Michael Telatynski
4ec602b960 Make cutout in the decorated room avatar transparent rather than fixed 2020-08-14 10:20:59 +01:00
Michael Telatynski
b8a260bb84 Change add room action for rooms to context menu 2020-08-13 16:18:26 +01:00
Michael Telatynski
df75024a21 Switch out the globe icon and colour it depending on theme 2020-08-13 15:16:31 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting 
Quick win session 24/07/2020
 2020-08-12 15:21:06 +01:00
Michael Telatynski
4799f0ee43
Merge pull request #5085 from matrix-org/t3chguy/notifications11 
Factor out Iconized Context menu for reusability
 2020-08-08 11:41:28 +01:00
Michael Telatynski
d126f5c1e6 tidy up IconizedContextMenu CSS 2020-08-04 21:42:45 +01:00
Jorik Schellekens
271eeeabee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting 2020-08-04 15:04:56 +01:00
J. Ryan Stinnett
ce226ab534 Replace Riot with Element in docs and comments 
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.

Part of https://github.com/vector-im/element-web/issues/14864
 2020-08-03 18:33:36 +01:00
J. Ryan Stinnett
71af4580e8 Convert jump to unread button 2020-07-31 20:39:17 +01:00
J. Ryan Stinnett
7aaa4997c2 Convert jump to bottom button 2020-07-31 20:33:15 +01:00
J. Ryan Stinnett
f28bce36e1 Merge remote-tracking branch 'origin/develop' into jryans/adjust-chevrons 2020-07-31 18:23:57 +01:00
J. Ryan Stinnett
31180d3df9 Adjust room list colours to match designs 2020-07-31 17:52:19 +01:00
J. Ryan Stinnett
8441763a71 Fix show less icon 2020-07-31 17:48:30 +01:00
Bruno Windels
6b667a93bd also center chevron in top unread button 2020-07-31 14:39:34 +02:00
Bruno Windels
29e17af2f8 scale the icon a bit, as centering changed it's size 2020-07-31 14:30:38 +02:00
Bruno Windels
561b8752b9 actually center the icon 2020-07-31 14:23:24 +02:00
Bruno Windels
01d624fdaf Make the reply preview not an overlay on the timeline anymore 
As users can't scroll down all the way down to the timeline like this to
see the last message (and perhaps adjust their reply to it)

This also remove the wrapper div as it is not needed anymore
 2020-07-31 13:47:40 +02:00
J. Ryan Stinnett
e917c0d92e Replace all chevrons with a single icon 
This replaces all chevrons with a single icon, affecting components like the
room list, network dropdown, and rebrand modal.

Rather than having files for each direction that can get out of sync, this
change uses one direction and rotates in CSS for the others.

Fixes https://github.com/vector-im/riot-web/issues/14663
 2020-07-30 16:49:46 +01:00
Jorik Schellekens
f64ef65f97 Use StyledRadioGroup 2020-07-28 17:13:58 +01:00
Jorik Schellekens
9cd232617d Unify composer and room header icons 2020-07-28 13:19:11 +01:00
Jorik Schellekens
1a9487f1be Left align display names irc layout 2020-07-27 16:21:44 +01:00
Jorik Schellekens
d55699211e Update copy icon on pre block and share dialogues 2020-07-27 15:13:02 +01:00
Michael Telatynski
992d7215c7 Remove poorly contrasted "dark style" heading in Room Preview Bar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-27 14:59:00 +01:00
Michael Telatynski
60a6b13f4b
Merge pull request #5026 from matrix-org/t3chguy/room-list/14440 
Put low priority xor toggle back in the room list context menu
 2020-07-24 00:02:50 +01:00
Travis Ralston
80687e358f Obliterate some flexboxes in the room list 
We don't need columns of divs to equally size themselves, so use easier layout techniques to make the list fit in the container. We have to take a hit with `height:100%`, but the hit is much more insignificant than confusing the layout engine.

The layout engine has a hard time with dynamically-but-statically-sized stuff like `width: 100%; display: flex;`, particularly when it is nested so badly. Overall this should improve performance for the app by not having to re-paint so often.

Fixes https://github.com/vector-im/riot-web/issues/14639
 2020-07-22 16:34:33 -06:00
Michael Telatynski
fe0c660fac Put low priority xor toggle back in the room list context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 09:50:20 +01:00
Michael Telatynski
0de6cada57
Merge pull request #5023 from matrix-org/t3chguy/room-list/14644 
Add min-width to floating Jitsi
 2020-07-20 15:24:26 +01:00
Michael Telatynski
ee8d885e70
Merge pull request #5020 from matrix-org/t3chguy/fix/14649 
Update crypto event icon to match rest of app styling
 2020-07-20 15:21:03 +01:00
Michael Telatynski
828cfb7138 Add min-width to floating Jitsi 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 15:15:21 +01:00
Michael Telatynski
8aceb11992 Fix community right panel button regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 14:47:06 +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
7996013cd5
Merge pull request #5013 from matrix-org/travis/room-list/rm-old 
[BREAKING] Remove the old room list
 2020-07-20 06:46:05 -06:00
Travis Ralston
361d524e7e Rename remaining SCSS variables to remove 2 suffix 2020-07-17 16:18:15 -06:00
Travis Ralston
40e4347114 Replace $roomtile-badge-fg-color with $accent-fg-color 2020-07-17 16:08:47 -06:00
Travis Ralston
1cecabb0b3 Replace $roomtile-name-color with $muted-fg-color (equivalent) 2020-07-17 16:03:26 -06:00
Travis Ralston
a30da8dcdb Rename RoomList2 SCSS variables 2020-07-17 15:59:35 -06:00
Travis Ralston
d7ada5f7c5 Remove TODO flags 2020-07-17 15:47:37 -06:00
Travis Ralston
c9b0b3b31d RoomSublist2 -> RoomSublist 2020-07-17 15:46:46 -06:00
Travis Ralston
96065ae982 RoomTile2 -> RoomTile 2020-07-17 15:43:29 -06:00
Travis Ralston
8dfe7b6cc7 RoomBreadcrumbs2 -> RoomBreadcrumbs 2020-07-17 15:32:06 -06:00
Travis Ralston
a7c18bfbfa RoomList2 -> RoomList 2020-07-17 15:27:49 -06:00
Travis Ralston
2441cbc9ac LeftPanel2 -> LeftPanel 2020-07-17 15:22:18 -06:00
Jorik Schellekens
58532f2ac4
Merge pull request #4990 from matrix-org/joriks/irc-layout-truncate-upload-name 
ellipse senders for images and videos
 2020-07-17 22:04:19 +01:00
Travis Ralston
3c047cecfd Remove core structures for the old room list 2020-07-17 14:17:11 -06:00
Michael Telatynski
9ec2ca447c Update style of default tooltips to match the new style 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 16:19:10 +01:00
Michael Telatynski
a704eefdd5 Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage 
 Conflicts:
	src/components/views/elements/AccessibleTooltipButton.tsx
 2020-07-16 15:47:12 +01:00
Michael Telatynski
e6dff951b8 Fix composer text alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:42:58 +01:00
Michael Telatynski
1a9680b527 Update font size of member filter field 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:40:31 +01:00
Michael Telatynski
576294e7ce Add shadow to the reply preview and autocomplete composer panes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:26:25 +01:00
Michael Telatynski
a2b5e5a6a1 Fix top right header button layout and hover consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:38:46 +01:00
Michael Telatynski
cb4f4c96b4 Update colour of typing indicator in timeline to match topic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:38:23 +01:00
Michael Telatynski
2b260a69a0 Change colour of unread count dot to primary fg 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:37:41 +01:00
Jorik Schellekens
2e8285590c
Merge pull request #4992 from matrix-org/joriks/irc-layout-e2e-icon 
Move e2e icon
 2020-07-16 14:35:08 +01:00
Jorik Schellekens
96f0681c2e Move e2e icon 2020-07-16 03:52:35 +01:00
Jorik Schellekens
bcbb3e8169 fix name jump 2020-07-16 03:14:20 +01:00
Jorik Schellekens
e873ba9608 ellipse senders for images and videos 2020-07-16 02:52:16 +01:00
Travis Ralston
17dba01993 Fix style lint 2020-07-15 03:49:59 -06:00
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