Merge remote-tracking branch 'origin/joriks/room-list-safari-fix' into develop

This commit is contained in:
Travis Ralston 2020-07-10 08:51:31 -06:00
commit 37a8b68539
2 changed files with 5 additions and 0 deletions

View file

@ -55,6 +55,7 @@ $tagPanelWidth: 70px; // only applies in this file, used for calculations
.mx_LeftPanel2_userHeader {
padding: 12px 12px 20px; // 12px top, 12px sides, 20px bottom
flex-shrink: 0;
// Create another flexbox column for the rows to stack within
display: flex;
@ -92,6 +93,8 @@ $tagPanelWidth: 70px; // only applies in this file, used for calculations
margin-left: 12px;
margin-right: 12px;
flex-shrink: 0;
// Create a flexbox to organize the inputs
display: flex;
align-items: center;

View file

@ -24,6 +24,8 @@ limitations under the License.
margin-left: 8px;
width: 100%;
flex-shrink: 0;
.mx_RoomSublist2_headerContainer {
// Create a flexbox to make alignment easy
display: flex;