Merge branch 'develop' into travis/presence

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

@@ -150,6 +150,16 @@ limitations under the License.
     display: block;
 }
 
+.mx_RoomStatusBar_isAlone {
+    height: 50px;
+    line-height: 50px;
+
+    color: $primary-fg-color;
+    opacity: 0.5;
+    overflow-y: hidden;
+    display: block;
+}
+
 .mx_MatrixChat_useCompactLayout {
     .mx_RoomStatusBar {
         min-height: 40px;

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

@@ -252,6 +252,16 @@ input.mx_UserSettings_phoneNumberField {
     display: none;
 }
 
+.mx_UserSettings_avatarPicker_imgContainer {
+    display: inline-block;
+}
+
+.mx_UserSettings_avatarPicker_remove {
+    display: inline-block;
+    float: right;
+    margin-right: -15px;
+}
+
 .mx_UserSettings_advanced_spoiler,
 .mx_UserSettings_link {
     cursor: pointer;

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

@@ -138,10 +138,17 @@ limitations under the License.
 .mx_RoomHeader_name,
 .mx_RoomHeader_avatar,
 .mx_RoomHeader_avatarPicker,
-.mx_RoomHeader_avatarPicker_edit {
+.mx_RoomHeader_avatarPicker_edit,
+.mx_RoomHeader_avatarPicker_remove {
     cursor: pointer;
 }
 
+.mx_RoomHeader_avatarPicker_remove {
+    position: absolute;
+    top: 10px;
+    left: 45px;
+}
+
 .mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) {
     color: $accent-color;
 }

src/skins/vector/css/themes/_dark.scss

@@ -131,6 +131,9 @@ $progressbar-color: #000;
 }
 
 // markdown overrides:
+.mx_EventTile_content .markdown-body pre:hover {
+    border-color: #808080 !important; // inverted due to rules below
+}
 .mx_EventTile_content .markdown-body {
     pre, code {
         filter: invert(1);