Šimon Brandner
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e5fd19c332
								
									
								
							
								
							
						 | 
						
							
							
								
								$primary-fg-color -> $primary-content
							
							
							
							
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 | 
						
							2021-08-12 17:18:18 +02:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								02dbdc5c0a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
							
							
							
							
							
							
							
							 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json 
							
						 | 
						
							2021-07-29 16:11:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								cdf0d98c3f
								
							
								
							
						 | 
						
							
							
								
								Fix IconizedContextMenuCheckbox layout
							
							
							
							
							
						 | 
						
							2021-07-28 17:39:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								010baabfe6
								
							
								
							
						 | 
						
							
							
								
								Improve subspaces and some utilities around room/space creation
							
							
							
							
							
						 | 
						
							2021-07-23 08:46:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								d679708058
								
							
								
							
						 | 
						
							
							
								
								Fix styling of disabled options in an Iconized menu
							
							
							
							
							
						 | 
						
							2021-03-01 15:40:46 +00:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								98b59fb217
								
							
								
							
						 | 
						
							
							
								
								Consolidate all the work thus far
							
							
							
							
							
						 | 
						
							2020-09-08 15:43:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								d126f5c1e6
								
							
								
							
						 | 
						
							
							
								
								tidy up IconizedContextMenu CSS
							
							
							
							
							
						 | 
						
							2020-08-04 21:42:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								b30ce0355e
								
							
								
							
						 | 
						
							
							
								
								Factor out Iconized Context Menu for reusabilit
							
							
							
							
							
						 | 
						
							2020-08-04 21:42:39 +01:00 |