Merge branch 'develop' into push-rules-settings

# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css

src/skins/vector/css/matrix-react-sdk/structures/RoomView.css

@@ -44,7 +44,7 @@ limitations under the License.
     min-width: 0px;
     max-width: 960px;
     width: 100%;
-    font-size: 20px;
+    font-size: 18px;
     text-align: center;
 
     pointer-events: none;
@@ -164,9 +164,19 @@ limitations under the License.
     margin-bottom: 12px;
 }
 
+li.mx_RoomView_myReadMarker_container {
+    height: 0px;
+    margin: 0px;
+    padding: 0px;
+    border: 0px;
+}
+
 hr.mx_RoomView_myReadMarker {
     border-top: solid 1px #76cfa6;
-    border-bottom: none;
+    border-bottom: solid 1px #76cfa6;
+    margin-top: 0px;
+    position: relative;
+    top: 5px;
 }
 
 .mx_RoomView_statusArea {

src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css

@@ -18,7 +18,38 @@ limitations under the License.
     width: 960px;
     margin-left: auto;
     margin-right: auto;
-    overflow-y: auto;
+
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+    flex-direction: column;
+    -webkit-flex-direction: column;    
+}
+
+.mx_UserSettings .mx_RoomHeader {
+    -webkit-box-ordinal-group: 1;
+    -moz-box-ordinal-group: 1;
+    -ms-flex-order: 1;
+    -webkit-order: 1;
+    order: 1;
+
+    -webkit-flex: 0 0 83px;
+    flex: 0 0 83px;
+}
+
+.mx_UserSettings_body {
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
+    order: 2;
+
+    -webkit-flex: 1 1 0;
+    flex: 1 1 0;
+
+    overflow-y: auto;    
 }
 
 .mx_UserSettings_spinner {
@@ -33,7 +64,6 @@ limitations under the License.
     display: inline;
     vertical-align: middle;
     border: 0px;
-    height: 36px;
     border-radius: 36px;
     font-weight: 400;
     font-size: 16px;
@@ -103,6 +133,7 @@ limitations under the License.
 .mx_UserSettings_profileInputCell input,
 .mx_UserSettings_profileInputCell .mx_EditableText
 {
+    display: inline-block;
     border: 0px;
     border-bottom: 1px solid rgba(151, 151, 151, 0.5);
     padding: 0px;
@@ -113,37 +144,27 @@ limitations under the License.
 }
 
 .mx_UserSettings_logout {
-    margin-right: 24px;
-    margin-bottom: 24px;
-    margin-left: 63px;
+    float: right;
+    margin-right: 32px;
+    margin-left: 32px;
 }
 
 .mx_UserSettings_avatarPicker {
-    width: 320px;
+    margin-left: 32px;
+    margin-right: 32px;
     float: right;
-}
-
-.mx_UserSettings_avatarPicker_edit {
-    position: relative;
-    left: 50%;
-    display: inline-block;
-    margin-top: 10px;
-}
-
-.mx_UserSettings_avatarPicker_edit > input{
-    display: none;
-}
-
-.mx_UserSettings_avatarPicker_edit > label {
     cursor: pointer;
 }
 
-.mx_UserSettings_avatarPicker_img {
-    margin: 0 auto;
-    width: 75%;
+.mx_UserSettings_avatarPicker .mx_RoomAvatar {
+    border-radius: 40px;
 }
 
-.mx_UserSettings_avatarPicker_img > img {
-    display: block;
-    margin: 0 auto;
+.mx_UserSettings_avatarPicker_edit {
+    text-align: center;
+    margin-top: 10px;
+}
+
+.mx_UserSettings_avatarPicker_edit > input {
+    display: none;
 }

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

@@ -105,6 +105,15 @@ limitations under the License.
    color: #4a4a4a;
 }
 
+.mx_Login_forgot {
+    font-size: 13px;
+    opacity: 0.8;
+}
+
+.mx_Login_forgot:link {
+    color: #4a4a4a;
+}
+
 .mx_Login_loader {
     position: absolute;
     left: 50%;