4064 commits

Author	SHA1	Message	Date
Eric Newport	d42fa9d17a	Hide inline encryption icons except when hovering over a message ... Closes https://github.com/vector-im/riot-web/issues/2882 This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988) I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.	2018-04-22 22:30:37 -04:00
Michael Telatynski	563fc9adc7	fix bad copy-paste from other diff ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-20 09:37:25 +01:00
Michael Telatynski	06408f843b	post BigMerge fixup - merge in stuff from riot-web PR ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-20 09:23:27 +01:00
Matthew Hodgson	6d1563449d	fix missing NLs	2018-04-17 16:57:08 +01:00
Matthew Hodgson	7b53e36698	retheming commentary	2018-04-17 16:55:32 +01:00
Matthew Hodgson	46f5c0d205	finish merging vector-im/riot-web#5881 into matrix-react-sdk	2018-04-16 01:13:03 +01:00
Matthew Hodgson	32dd7f976f	merge vector-im/riot-web#5881 into matrix-react-sdk	2018-04-16 00:04:04 +01:00
Matthew Hodgson	5f3e4444d0	fix theme paths	2018-04-13 01:25:34 +01:00
Matthew Hodgson	5d03eabb15	rethemedex	2018-04-13 00:54:41 +01:00
Matthew Hodgson	8371774d13	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
Matthew Hodgson	8ce4df7ce3	move non-Riot image resources over from riot-web	2018-04-12 00:25:07 +01:00
Matthew Hodgson	848403a0ab	move default fonts over from riot-web	2018-04-12 00:24:51 +01:00
Matthew Hodgson	cdb5d489a4	organise themes (even light & dark) in the SDK layer	2018-04-12 00:24:22 +01:00
Matthew Hodgson	79d3cca6e9	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00