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  
				
					
						
							
							
								 
						
							
							
								9b13ef1446 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge branch 'joriks/horizontal-resize-bars' into 'element'"  
							
							... 
							
							
							
							This reverts commit eb0cb5c279 
							
						 
						
							2020-07-16 15:31:41 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								eb0cb5c279 
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Merge branch 'joriks/horizontal-resize-bars' into 'element'""  
							
							... 
							
							
							
							This reverts commit 8cde611653 
							
						 
						
							2020-07-15 04:52:34 -06:00  
				
					
						
							
							
								 
						
							
							
								8cde611653 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge branch 'joriks/horizontal-resize-bars' into 'element'"  
							
							... 
							
							
							
							This reverts commit 2a4c09880c 
							
						 
						
							2020-07-14 18:45:01 -06:00  
				
					
						
							
							
								 
						
							
							
								1f94986c88 
								
							
								 
							
						 
						
							
							
								
								add horizontal handlebars  
							
							
							
						 
						
							2020-07-15 00:20:39 +01:00  
				
					
						
							
							
								 
						
							
							
								936f24eb15 
								
							
								 
							
						 
						
							
							
								
								change look of right panel header buttons  
							
							
							
						 
						
							2020-07-14 21:09:18 +02:00  
				
					
						
							
							
								 
						
							
							
								38549ecf4c 
								
							
								 
							
						 
						
							
							
								
								change accent color  
							
							
							
						 
						
							2020-07-14 20:36:27 +02:00  
				
					
						
							
							
								 
						
							
							
								a5c8485e23 
								
							
								 
							
						 
						
							
							
								
								Minor padding fixes to communities  
							
							
							
						 
						
							2020-07-14 10:16:00 -06:00  
				
					
						
							
							
								 
						
							
							
								d7e8dbbab5 
								
							
								 
							
						 
						
							
							
								
								Remove extraneous scrollbar on TagPanel when few communities are shown  
							
							
							
						 
						
							2020-07-14 09:08:07 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a1ff00a7a8 
								
							
								 
							
						 
						
							
							
								
								Fix scrollbar occlusion in the right panel  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-13 22:13:29 +01:00  
				
					
						
							
							
								 
						
							
							
								b45adda676 
								
							
								 
							
						 
						
							
							
								
								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:56:52 +01:00  
				
					
						
							
							
								 
						
							
							
								93e1ba4699 
								
							
								 
							
						 
						
							
							
								
								Change border radius of context menus and dialog from 4px to 8px  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-13 21:56:48 +01:00  
				
					
						
							
							
								 
						
							
							
								d136d02f5e 
								
							
								 
							
						 
						
							
							
								
								Stylise right panel as card  
							
							
							
						 
						
							2020-07-13 21:52:31 +01:00  
				
					
						
							
							
								 
						
							
							
								fafbd25f6b 
								
							
								 
							
						 
						
							
							
								
								Tweak padding & weight  
							
							
							
						 
						
							2020-07-13 20:57:24 +01:00  
				
					
						
							
							
								 
						
							
							
								a3b1c93149 
								
							
								 
							
						 
						
							
							
								
								Tweak padding  
							
							
							
						 
						
							2020-07-13 20:50:26 +01:00  
				
					
						
							
							
								 
						
							
							
								87a8dc4ff0 
								
							
								 
							
						 
						
							
							
								
								Improve spacing  
							
							
							
						 
						
							2020-07-13 20:41:18 +01:00  
				
					
						
							
							
								 
						
							
							
								b28bb34cb7 
								
							
								 
							
						 
						
							
							
								
								Small tweaks to padding and sizing  
							
							
							
						 
						
							2020-07-13 20:13:20 +01:00  
				
					
						
							
							
								 
						
							
							
								995a7879a1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into element  
							
							
							
						 
						
							2020-07-13 18:49:55 +01:00  
				
					
						
							
							
								 
						
							
							
								ec65083c61 
								
							
								 
							
						 
						
							
							
								
								polish user menu button  
							
							
							
						 
						
							2020-07-13 18:24:28 +02:00  
				
					
						
							
							
								 
						
							
							
								19ebf3beec 
								
							
								 
							
						 
						
							
							
								
								make overscroll gradients smaller so they pop less when appearing  
							
							
							
						 
						
							2020-07-13 18:24:28 +02:00  
				
					
						
							
							
								 
						
							
							
								b19afe4d46 
								
							
								 
							
						 
						
							
							
								
								reduce distance between tiles to 12px, so we can align things in LP with  
							
							
							
						 
						
							2020-07-13 18:24:28 +02:00  
				
					
						
							
							
								 
						
							
							
								965856aa55 
								
							
								 
							
						 
						
							
							
								
								align breadcrumbs with community avatar grid  
							
							
							
						 
						
							2020-07-13 18:24:28 +02:00  
				
					
						
							
							
								 
						
							
							
								375f6fa4d8 
								
							
								 
							
						 
						
							
							
								
								make search field 32px high, just like avatars  
							
							
							
						 
						
							2020-07-13 18:24:28 +02:00  
				
					
						
							
							
								 
						
							
							
								02b27086da 
								
							
								 
							
						 
						
							
							
								
								swap search field and breadcrumbs  
							
							
							
						 
						
							2020-07-13 18:24:28 +02:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a2cb6f375a 
								
							
								 
							
						 
						
							
							
								
								fix padding upon Nads request  
							
							
							
						 
						
							2020-07-10 19:06:48 +02:00  
				
					
						
							
							
								 
						
							
							
								952200f031 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into element  
							
							
							
						 
						
							2020-07-10 19:04:45 +02:00  
				
					
						
							
							
								 
						
							
							
								bf0a503e44 
								
							
								 
							
						 
						
							
							
								
								[WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable  
							
							
							
						 
						
							2020-07-10 10:18:12 -06:00  
				
					
						
							
							
								 
						
							
							
								976f7381ab 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/joriks/room-list-fix-search-padding' into develop  
							
							
							
						 
						
							2020-07-10 08:53:30 -06:00  
				
					
						
							
							
								 
						
							
							
								2bf2a08e7a 
								
							
								 
							
						 
						
							
							
								
								Mark safari hacks  
							
							
							
						 
						
							2020-07-10 08:52:46 -06:00  
				
					
						
							
							
								 
						
							
							
								37a8b68539 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/joriks/room-list-safari-fix' into develop  
							
							
							
						 
						
							2020-07-10 08:51:31 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								42e101340e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4942  from matrix-org/joriks/room-list-breadcrumbs-scroll-fade  
							
							... 
							
							
							
							Scroll fade for breadcrumbs 
							
						 
						
							2020-07-10 10:37:55 +00:00  
				
					
						
							
							
								 
						
							
							
								6dc7a5631b 
								
							
								 
							
						 
						
							
							
								
								make tag panel less wide  
							
							
							
						 
						
							2020-07-10 12:27:48 +02:00  
				
					
						
							
							
								 
						
							
							
								75dbd5f1d4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/enable  
							
							
							
						 
						
							2020-07-09 22:28:16 -06:00  
				
					
						
							
							
								 
						
							
							
								e4366632cf 
								
							
								 
							
						 
						
							
							
								
								Fix search padding  
							
							
							
						 
						
							2020-07-10 02:54:11 +01:00  
				
					
						
							
							
								 
						
							
							
								edb556f22e 
								
							
								 
							
						 
						
							
							
								
								Stop safari from agressivly shrinking  
							
							
							
						 
						
							2020-07-10 02:15:46 +01:00  
				
					
						
							
							
								 
						
							
							
								e2539f11cd 
								
							
								 
							
						 
						
							
							
								
								Scroll fade for breadcrumbs  
							
							
							
						 
						
							2020-07-09 19:24:02 +01:00  
				
					
						
							
							
								 
						
							
							
								d90fc57469 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into element  
							
							
							
						 
						
							2020-07-09 17:59:56 +02:00  
				
					
						
							
							
								 
						
							
							
								f9aca7c05e 
								
							
								 
							
						 
						
							
							
								
								Avoid bounding box usage in sticky headers & improve reliability  
							
							... 
							
							
							
							We now use offsets and scroll information to determine where the headers should be stuck to, still supporting the transparent background.
Some scroll jumps were originally introduced as part of the change in numbering, so they have been fixed here. By proxy, some additional scroll jump/instability should be fixed as well.
This has a lingering problem of still causing a huge number of no-op UI updates though, which will be dealt with in a future commit. 
							
						 
						
							2020-07-08 14:37:35 -06:00  
				
					
						
							
							
								 
						
							
							
								571bd30898 
								
							
								 
							
						 
						
							
							
								
								update call icons  
							
							
							
						 
						
							2020-07-08 18:02:30 +02:00  
				
					
						
							
							
								 
						
							
							
								7dad56ca86 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into element  
							
							
							
						 
						
							2020-07-08 15:50:17 +02:00  
				
					
						
							
							
								 
						
							
							
								0d94cfa97a 
								
							
								 
							
						 
						
							
							
								
								put sticky headers in padding of wrapper  
							
							... 
							
							
							
							this way they don't need a background, as the list is already clipped 
							
						 
						
							2020-07-08 14:49:38 +02:00  
				
					
						
							
							
								 
						
							
							
								75751abc60 
								
							
								 
							
						 
						
							
							
								
								add wrapper we can then add padding to when sticking headers  
							
							
							
						 
						
							2020-07-08 14:49:04 +02:00  
				
					
						
							
							
								 
						
							
							
								a59a8b76a9 
								
							
								 
							
						 
						
							
							
								
								Update TODO comments to point to new issue  
							
							
							
						 
						
							2020-07-07 14:51:43 -06:00  
				
					
						
							
							
								 
						
							
							
								8fd9dbf1d8 
								
							
								 
							
						 
						
							
							
								
								moar icon changes  
							
							
							
						 
						
							2020-07-06 18:28:54 +02:00  
				
					
						
							
							
								 
						
							
							
								3e5664de7b 
								
							
								 
							
						 
						
							
							
								
								update user menu icons  
							
							
							
						 
						
							2020-07-06 16:12:36 +02:00  
				
					
						
							
							
								 
						
							
							
								08c44333cf 
								
							
								 
							
						 
						
							
							
								
								Update develop  
							
							
							
						 
						
							2020-07-06 09:29:23 +02:00