Merge branch 'develop' into gsouquet/switch-rooms

2021-06-01 09:02:28 +01:00 · 2021-06-01 09:02:28 +01:00 · d894cc6f7a
commit d894cc6f7a
parent 1a51ed9ffd 30e136d103
13 changed files with 216 additions and 122 deletions
--- a/res/css/views/rooms/_RoomSublist.scss
+++ b/res/css/views/rooms/_RoomSublist.scss
@ -61,6 +61,7 @@ limitations under the License.
            &.mx_RoomSublist_headerContainer_sticky {
                position: fixed;
                height: 32px; // to match the header container
+                // width set by JS because of a compat issue between Firefox and Chrome
                width: calc(100% - 15px);
            }