Michael Telatynski
|
f2102e283c
|
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
|
2018-05-02 13:08:38 +01:00 |
|
Luke Barnard
|
22047d7e72
|
Merge pull request #1845 from kethinov/hide_encryption_icons
Hide inline encryption icons except when hovering over a message
|
2018-04-30 17:57:22 +01:00 |
|
Eric Newport
|
e037cf0063
|
namespace CSS better and fix bug
|
2018-04-30 12:22:16 -04:00 |
|
Matthew Hodgson
|
45c0c0eddd
|
add CSS destroyed by stickerpacks
fixing mangling from 9fc7435ea2 (diff-be2f1d72c9704840ceddf019c825e825)
and 38efebb8d3 (diff-be2f1d72c9704840ceddf019c825e825)
also fixes https://github.com/vector-im/riot-web/issues/6492
|
2018-04-29 04:50:44 +01:00 |
|
Eric Newport
|
55566b35a2
|
convert attribute to class
|
2018-04-28 12:39:25 -04:00 |
|
Michael Telatynski
|
71acf87c04
|
Add comments to _EventTile.scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-27 11:13:09 +01:00 |
|
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
|
32dd7f976f
|
merge vector-im/riot-web#5881 into matrix-react-sdk
|
2018-04-16 00:04:04 +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 |
|