Merge branch 'develop' into new-guest-access

src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss

@@ -172,7 +172,7 @@ hr.mx_RoomView_myReadMarker {
 
     max-height: 0px;
     background-color: $primary-bg-color;
-    z-index: 5;
+    z-index: 1000;
     overflow: hidden;
 
     -webkit-transition: all .2s ease-out;
@@ -260,4 +260,4 @@ hr.mx_RoomView_myReadMarker {
 
 .mx_RoomView_ongoingConfCallNotification a {
     color: $accent-fg-color ! important;
-}
+}

src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss

@@ -219,6 +219,10 @@ input.mx_UserSettings_phoneNumberField {
     margin-top: 10px;
 }
 
+.mx_UserSettings_avatarPicker_edit img {
+    cursor: pointer;
+}
+
 .mx_UserSettings_avatarPicker_edit > input {
     display: none;
 }

src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss

@@ -184,7 +184,7 @@ limitations under the License.
 }
 
 .mx_Login_field_prefix {
-    height: 33px;
+    height: 34px;
     padding: 0px 5px;
     line-height: 33px;
 
@@ -197,7 +197,7 @@ limitations under the License.
 }
 
 .mx_Login_field_suffix {
-    height: 33px;
+    height: 34px;
     padding: 0px 5px;
     line-height: 33px;
 
@@ -211,11 +211,16 @@ limitations under the License.
 }
 
 .mx_Login_username {
+    height: 16px;
     flex-shrink: 1;
     min-width: 0px;
     border-radius: 3px;
 }
 
+.mx_Login_phoneNumberField {
+    height: 16px;
+}
+
 .mx_Login_field_has_prefix {
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
@@ -226,8 +231,23 @@ limitations under the License.
     border-bottom-right-radius: 0px;
 }
 
+.mx_Login_phoneSection {
+    display:flex;
+}
+
 .mx_Login_phoneCountry {
     margin-bottom: 14px;
+    width: 150px;
+
+    /* To override mx_Login_field_prefix */
+    text-align: left;
+    padding: 0px;
+    background-color: $primary-bg-color;
+}
+
+.mx_Login_field_prefix .mx_Dropdown_input {
+    /* To use prefix border instead of dropdown border */
+    border: 0;
 }
 
 .mx_Login_phoneCountry .mx_Dropdown_option {
@@ -240,6 +260,6 @@ limitations under the License.
 }
 
 .mx_Login_phoneCountry .mx_Dropdown_option img {
-    margin: 4px;
+    margin: 3px;
     vertical-align: top;
 }

src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss

@@ -48,6 +48,14 @@ limitations under the License.
     width: 0
 }
 
+.mx_Dropdown.left_aligned .mx_Dropdown_arrow {
+    left: 10px;
+}
+
+.mx_Dropdown.left_aligned .mx_Dropdown_input > .mx_Dropdown_option {
+    padding-left: 25px;
+}
+
 .mx_Dropdown_option {
     height: 35px;
     line-height: 35px;
@@ -55,9 +63,15 @@ limitations under the License.
     padding-right: 8px;
 }
 
+.mx_Dropdown_option div {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
 .mx_Dropdown_option img {
     margin: 5px;
-    width: 25px;
+    width: 27px;
     vertical-align: middle;
 }
 

src/skins/vector/css/matrix-react-sdk/views/elements/_RoleButton.scss

@@ -1,33 +0,0 @@
-/*
-Copyright 2107 Vector Creations Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_RoleButton {
-    margin-left: 4px;
-    margin-right: 4px;
-    cursor: pointer;
-    display: inline-block;
-}
-
-.mx_RoleButton object {
-    pointer-events: none;
-}
-
-.mx_RoleButton_tooltip {
-    display: inline-block;
-    position: relative;
-    top: -25px;
-    left: 6px;
-}

src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss

@@ -1,6 +1,5 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2107 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -38,25 +37,3 @@ limitations under the License.
 .mx_RoomList_scrollbar .gm-scrollbar.-vertical {
     z-index: 6;
 }
-
-.mx_RoomList_emptySubListTip {
-    font-size: 13px;
-    margin-left: 18px;
-    margin-right: 18px;
-    margin-top: 8px;
-    margin-bottom: 7px;
-    padding: 5px;
-    border: 1px dashed $accent-color;
-    color: $primary-fg-color;
-    background-color: $droptarget-bg-color;
-    border-radius: 4px;
-}
-
-.mx_RoomList_emptySubListTip .mx_RoleButton {
-    vertical-align: -3px;
-}
-
-.mx_RoomList_headerButtons {
-    position: absolute;
-    right: 60px;
-}