Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting

2020-08-04 15:04:56 +01:00
parent 4bebbad365 c1ec41715c
commit 271eeeabee
315 changed files with 8146 additions and 2874 deletions
--- a/res/css/structures/_FilePanel.scss
+++ b/res/css/structures/_FilePanel.scss
@@ -115,3 +115,7 @@ limitations under the License.
 .mx_FilePanel .mx_EventTile:hover .mx_EventTile_line {
    background-color: $primary-bg-color;
 }
+
+.mx_FilePanel_empty::before {
+    mask-image: url('$(res)/img/element-icons/room/files.svg');
+}