Merge branch 'develop' into joriks/fix-filepanel-regression

res/css/_components.scss

@@ -63,7 +63,6 @@
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DeviceVerifyDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
-@import "./views/dialogs/_EncryptedEventDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";

res/css/views/dialogs/_EncryptedEventDialog.scss

@@ -1,34 +0,0 @@
-/*
-Copyright 2016 OpenMarket 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_EncryptedEventDialog .mx_DeviceVerifyButtons {
-    float: right;
-    padding: 0px;
-    margin-right: 42px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-}
-
-.mx_EncryptedEventDialog .mx_MemberDeviceInfo_textButton {
-    @mixin mx_DialogButton;
-    background-color: $primary-bg-color;
-    color: $accent-color;
-}
-
-.mx_EncryptedEventDialog button {
-    margin-top: 0px;
-}

res/css/views/dialogs/_ShareDialog.scss

@@ -55,6 +55,7 @@ limitations under the License.
     margin-left: 5px;
     width: 20px;
     height: 20px;
+    background-repeat: none;
 }
 
 .mx_ShareDialog_split {

res/css/views/globals/_MatrixToolbar.scss

@@ -67,7 +67,3 @@ limitations under the License.
 .mx_MatrixToolbar_action {
     margin-right: 16px;
 }
-
-.mx_MatrixToolbar_changelog {
-    white-space: pre;
-}

res/css/views/rooms/_IRCLayout.scss

@@ -41,7 +41,7 @@ $irc-line-height: $font-18px;
         }
 
         > .mx_EventTile_msgOption {
-            order: 4;
+            order: 5;
             flex-shrink: 0;
         }
 
@@ -63,6 +63,8 @@ $irc-line-height: $font-18px;
             flex-direction: column;
             order: 3;
             flex-grow: 1;
+            flex-shrink: 1;
+            min-width: 0;
         }
 
         > .mx_EventTile_avatar {
@@ -90,12 +92,14 @@ $irc-line-height: $font-18px;
             text-align: right;
         }
 
-        .mx_EventTile_e2eIcon {
+        > .mx_EventTile_e2eIcon {
             position: relative;
             right: unset;
             left: unset;
-            top: -2px;
             padding: 0;
+            order: 3;
+            flex-shrink: 0;
+            flex-grow: 0;
         }
 
         .mx_EventTile_line {
@@ -113,7 +117,7 @@ $irc-line-height: $font-18px;
         }
 
         .mx_EventTile_reply {
-            order: 3;
+            order: 4;
         }
 
         .mx_EditMessageComposer_buttons {

res/css/views/rooms/_RoomTile.scss

@@ -20,7 +20,7 @@ limitations under the License.
     flex-direction: row;
     align-items: center;
     cursor: pointer;
-    height: 32px;
+    height: 34px;
     margin: 0;
     padding: 0 8px 0 10px;
     position: relative;