1bbf1502ec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' into bwindels/smarterresizer  
							
							
							
						 
						
							2019-01-15 10:23:50 +01:00  
				
					
						
							
							
								 
						
							
							
								961e0d24df 
								
							
								 
							
						 
						
							
							
								
								flex-basis to 0 so sublists shrink/grow not-relative to their content  
							
							
							
						 
						
							2019-01-14 14:41:31 +01:00  
				
					
						
							
							
								 
						
							
							
								a413f358f7 
								
							
								 
							
						 
						
							
							
								
								normalize sizes when starting drag operation  
							
							
							
						 
						
							2019-01-11 17:17:58 +01:00  
				
					
						
							
							
								 
						
							
							
								35af3fc6f7 
								
							
								 
							
						 
						
							
							
								
								Add separate dialog for recovery method removed  
							
							... 
							
							
							
							The "New Recovery Method" dialog would show if either the recovery method had
been changed or removed, but the dialog text didn't make much sense for the
removed case.
This adds a separate dialog customized for the removed case.
Fixes https://github.com/vector-im/riot-web/issues/8046 . 
							
						 
						
							2019-01-10 15:18:57 -06:00  
				
					
						
							
							
								 
						
							
							
								cbf9ff6aee 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters  
							
							
							
						 
						
							2019-01-10 16:56:47 +00:00  
				
					
						
							
							
								 
						
							
							
								1a2727f0af 
								
							
								 
							
						 
						
							
							
								
								sized items cannot grow, unsized items start with their content size and shrink from there  
							
							
							
						 
						
							2019-01-10 14:03:55 +01:00  
				
					
						
							
							
								 
						
							
							
								40e8e48e08 
								
							
								 
							
						 
						
							
							
								
								fix grid growing wider than viewport  
							
							
							
						 
						
							2019-01-09 19:05:21 +01:00  
				
					
						
							
							
								 
						
							
							
								ece5cb1fcc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2348  from matrix-org/bwindels/roomgridview-experimental  
							
							... 
							
							
							
							Tiled room UI 
							
						 
						
							2019-01-09 17:25:08 +00:00  
				
					
						
							
							
								 
						
							
							
								79df843a6e 
								
							
								 
							
						 
						
							
							
								
								Fix path to New Recovery Method icon  
							
							
							
						 
						
							2019-01-09 06:25:35 -06:00  
				
					
						
							
							
								 
						
							
							
								254427461d 
								
							
								 
							
						 
						
							
							
								
								fix PR feedback  
							
							
							
						 
						
							2019-01-09 12:48:13 +01:00  
				
					
						
							
							
								 
						
							
							
								0c364510ef 
								
							
								 
							
						 
						
							
							
								
								trying to make the left panel not grow taller than available space  
							
							
							
						 
						
							2019-01-08 18:16:37 +01:00  
				
					
						
							
							
								 
						
							
							
								b4197059a0 
								
							
								 
							
						 
						
							
							
								
								change min size to exactly one room tile + header  
							
							
							
						 
						
							2019-01-08 18:16:09 +01:00  
				
					
						
							
							
								 
						
							
							
								4bd6ce8e2c 
								
							
								 
							
						 
						
							
							
								
								WIP2 for making smart resizer work, sort of works now but shows big scrollbar  
							
							
							
						 
						
							2019-01-08 16:47:47 +01:00  
				
					
						
							
							
								 
						
							
							
								9e67dbf008 
								
							
								 
							
						 
						
							
							
								
								change icon  
							
							
							
						 
						
							2019-01-08 14:35:26 +01:00  
				
					
						
							
							
								 
						
							
							
								7227049c2a 
								
							
								 
							
						 
						
							
							
								
								add right panel toggle button to room header when in grid  
							
							
							
						 
						
							2019-01-08 12:05:39 +01:00  
				
					
						
							
							
								 
						
							
							
								e5f74957cb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2408  from matrix-org/dbkr/fix_gif_icon_on_stickers  
							
							... 
							
							
							
							Fix black-on-black GIF icon for stickers 
							
						 
						
							2019-01-08 09:35:06 +00:00  
				
					
						
							
							
								 
						
							
							
								2ff532621c 
								
							
								 
							
						 
						
							
							
								
								Remove unbalanced padding in create key backup dialog  
							
							... 
							
							
							
							This padding only one side made it impossible to center things in the dialog.
Since the dialog also has nice spacing without the padding, this change removes
it.
Fixes https://github.com/vector-im/riot-web/issues/7862 . 
							
						 
						
							2019-01-07 17:48:10 -06:00  
				
					
						
							
							
								 
						
							
							
								a1daecc249 
								
							
								 
							
						 
						
							
							
								
								Remove empty CSS rule  
							
							
							
						 
						
							2019-01-07 14:12:32 -06:00  
				
					
						
							
							
								 
						
							
							
								f60a865727 
								
							
								 
							
						 
						
							
							
								
								Restore room name ellipsis on overflow  
							
							... 
							
							
							
							Fixes  vector-im/riot-web#8037 . 
						
							2019-01-07 14:12:32 -06:00  
				
					
						
							
							
								 
						
							
							
								7a1008f1fe 
								
							
								 
							
						 
						
							
							
								
								Fix color for @room pills in HTML messages  
							
							
							
						 
						
							2019-01-07 09:56:40 -06:00  
				
					
						
							
							
								 
						
							
							
								bf87547f88 
								
							
								 
							
						 
						
							
							
								
								Remove unexpected underline from pills  
							
							... 
							
							
							
							Fixes  vector-im/riot-web#8031 . 
						
							2019-01-07 09:56:40 -06:00  
				
					
						
							
							
								 
						
							
							
								9a5f17d0b1 
								
							
								 
							
						 
						
							
							
								
								Change CSS to match experimental  
							
							
							
						 
						
							2019-01-07 15:21:00 +00:00  
				
					
						
							
							
								 
						
							
							
								8a6e7382ae 
								
							
								 
							
						 
						
							
							
								
								Missing newline  
							
							
							
						 
						
							2019-01-07 13:52:13 +00:00  
				
					
						
							
							
								 
						
							
							
								712241d710 
								
							
								 
							
						 
						
							
							
								
								Add simple state counters to room heading  
							
							
							
						 
						
							2019-01-07 13:52:13 +00:00  
				
					
						
							
							
								 
						
							
							
								54898a6c35 
								
							
								 
							
						 
						
							
							
								
								Fix black-on-black GIF icon for stickers  
							
							... 
							
							
							
							Text colour ended up being the link colour on images because the
whole image is in an `a`, but stickers are not so it got the default
font colour, which might be black. Define an explicit colour.
Also set pointer-events: none so you can hover over the gif icon
too (I managed to make the message panel small which made the icon
cover most the image, so this prevented the gif from animating
at all).
Fixes https://github.com/vector-im/riot-web/issues/8004  
							
						 
						
							2019-01-07 13:49:01 +00:00  
				
					
						
							
							
								 
						
							
							
								290dc9d8fb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' into bwindels/roomgridview-experimental  
							
							
							
						 
						
							2019-01-07 14:17:57 +01:00  
				
					
						
							
							
								 
						
							
							
								a7c9d4ea1f 
								
							
								 
							
						 
						
							
							
								
								Use same link style in HTML messages  
							
							... 
							
							
							
							Links in HTML messages were missing the usual underline style, making them
look different from links in text messages (which already do this).
Fixes  vector-im/riot-web#4655 . 
							
						 
						
							2019-01-04 18:32:43 -06:00  
				
					
						
							
							
								 
						
							
							
								2769e68169 
								
							
								 
							
						 
						
							
							
								
								Give the create key backup title more space  
							
							
							
						 
						
							2019-01-04 17:14:10 -06:00  
				
					
						
							
							
								 
						
							
							
								97747640bb 
								
							
								 
							
						 
						
							
							
								
								Record keys button styling tweak  
							
							
							
						 
						
							2019-01-04 17:14:10 -06:00  
				
					
						
							
							
								 
						
							
							
								93ea9d3617 
								
							
								 
							
						 
						
							
							
								
								Condense .mx_RoomTile_avatar properties  
							
							... 
							
							
							
							Looks like the develop->experimental merge duplicated the definition. We'll take the best of both and make it work. 
							
						 
						
							2019-01-03 18:07:34 -07:00  
				
					
						
							
							
								 
						
							
							
								852d6df580 
								
							
								 
							
						 
						
							
							
								
								Fix composer avatar being an oval when a custom status is set  
							
							... 
							
							
							
							Fixes this: https://t2l.io/_matrix/media/v1/download/t2l.io/0d5c7fa9a4b5bf226a020def8480a887  
							
						 
						
							2019-01-03 18:06:37 -07:00  
				
					
						
							
							
								 
						
							
							
								51dc1fe9bf 
								
							
								 
							
						 
						
							
							
								
								Fix badges on room tiles not being right aligned  
							
							... 
							
							
							
							Thanks to Ryan for fixing this!
Problem: https://t2l.io/_matrix/media/v1/download/t2l.io/da6fccb60969da1c455630faae990881  
							
						 
						
							2019-01-03 18:05:59 -07:00  
				
					
						
							
							
								 
						
							
							
								920911c0a1 
								
							
								 
							
						 
						
							
							
								
								Room list fixes for custom status  
							
							
							
						 
						
							2019-01-03 18:49:15 -06:00  
				
					
						
							
							
								 
						
							
							
								ff2faf7996 
								
							
								 
							
						 
						
							
							
								
								Add missing CSS to dharma theme  
							
							
							
						 
						
							2019-01-03 16:32:52 -07:00  
				
					
						
							
							
								 
						
							
							
								8017f0a4a1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real  
							
							
							
						 
						
							2019-01-03 16:00:23 -07:00  
				
					
						
							
							
								 
						
							
							
								6447a60e1f 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge pull request  #2336  from matrix-org/travis/notif-button"  
							
							... 
							
							
							
							This reverts commit 96300b45b7 
							
						 
						
							2019-01-03 15:44:07 -07:00  
				
					
						
							
							
								 
						
							
							
								f928be6f59 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge pull request  #2395  from matrix-org/dbkr/merge_develop_experimental"  
							
							... 
							
							
							
							This reverts commit ad47144355 
							
						 
						
							2019-01-03 15:37:03 -07:00  
				
					
						
							
							
								 
						
							
							
								982e037822 
								
							
								 
							
						 
						
							
							
								
								Fix merge  
							
							
							
						 
						
							2019-01-03 18:05:38 +00:00  
				
					
						
							
							
								 
						
							
							
								7d161de35b 
								
							
								 
							
						 
						
							
							
								
								Partial merge of develop to experimental  
							
							... 
							
							
							
							Does not include #2336  as the file has been moved out from underneath it:
will do this separately 
							
						 
						
							2019-01-03 15:02:58 +00:00  
				
					
						
							
							
								 
						
							
							
								00405e7f22 
								
							
								 
							
						 
						
							
							
								
								Use Nunito font from the server only  
							
							... 
							
							
							
							There are various versions of Nunito in circulation, and some have errors in
their metrics or smaller supported character sets. To ensure all users get the
expected experience, don't allow local copies of Nunito to be used.
Fixes  vector-im/riot-web#7959 . 
							
						 
						
							2018-12-31 12:26:35 -06:00  
				
					
						
							
							
								 
						
							
							
								5723ae6040 
								
							
								 
							
						 
						
							
							
								
								Defined $accent-color-alt in all themes  
							
							
							
						 
						
							2018-12-20 16:06:02 +00:00  
				
					
						
							
							
								 
						
							
							
								09bf68b1bd 
								
							
								 
							
						 
						
							
							
								
								Improved colours.  
							
							
							
						 
						
							2018-12-20 12:46:43 +00:00  
				
					
						
							
							
								 
						
							
							
								42c8d43065 
								
							
								 
							
						 
						
							
							
								
								Lint.  
							
							
							
						 
						
							2018-12-20 11:35:58 +00:00  
				
					
						
							
							
								 
						
							
							
								9b8f07c19f 
								
							
								 
							
						 
						
							
							
								
								Don't override text colour of selected room in room list.  
							
							
							
						 
						
							2018-12-20 11:35:43 +00:00  
				
					
						
							
							
								 
						
							
							
								d7473c4f4d 
								
							
								 
							
						 
						
							
							
								
								Various colour, contrast and legibility improvements.  
							
							
							
						 
						
							2018-12-20 11:35:21 +00:00  
				
					
						
							
							
								 
						
							
							
								6c2d2f60cf 
								
							
								 
							
						 
						
							
							
								
								Polished left left panel.  
							
							
							
						 
						
							2018-12-20 11:34:20 +00:00  
				
					
						
							
							
								 
						
							
							
								b61aa33e99 
								
							
								 
							
						 
						
							
							
								
								Tint input icon.  
							
							
							
						 
						
							2018-12-20 11:33:53 +00:00  
				
					
						
							
							
								 
						
							
							
								2e1e536d5c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2347  from matrix-org/travis/custom-status  
							
							... 
							
							
							
							Custom status messages 
							
						 
						
							2018-12-19 11:11:15 -07:00  
				
					
						
							
							
								 
						
							
							
								24f0123ded 
								
							
								 
							
						 
						
							
							
								
								Convert pass phrase entry to flexbox  
							
							... 
							
							
							
							Signed-off-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2018-12-19 17:46:37 +00:00  
				
					
						
							
							
								 
						
							
							
								9c4ff4048a 
								
							
								 
							
						 
						
							
							
								
								Convert show recovery key to flexbox  
							
							... 
							
							
							
							This allows the buttons to fit on a single line and flows a bit better at low
widths.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2018-12-19 17:46:37 +00:00