Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345

Conflicts: src/components/views/rooms/RoomSublist2.tsx src/components/views/rooms/RoomTile2.tsx
2020-07-07 17:11:04 +01:00
parent 19e1c79796 262c7b1fa5
commit 986d56ffdc
9 changed files with 104 additions and 66 deletions
@@ -81,7 +81,7 @@ limitations under the License.
        }
    }

-    .mx_RoomTile2_menuButton {
+    .mx_RoomTile2_notificationsButton {
        margin-left: 4px; // spacing between buttons
    }

@@ -112,7 +112,8 @@ limitations under the License.
        width: 20px;
        min-width: 20px; // yay flex
        height: 20px;
-        margin: auto 0;
+        margin-top: auto;
+        margin-bottom: auto;
        position: relative;
        display: none;