Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup

res/css/views/elements/_FormButton.scss

@@ -0,0 +1,36 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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_FormButton {
+    line-height: 16px;
+    padding: 5px 15px;
+    font-size: 12px;
+    height: min-content;
+
+    &:not(:last-child) {
+        margin-right: 8px;
+    }
+
+    &.mx_AccessibleButton_kind_primary {
+        color: $accent-color;
+        background-color: $accent-bg-color;
+    }
+
+    &.mx_AccessibleButton_kind_danger {
+        color: $notice-primary-color;
+        background-color: $notice-primary-bg-color;
+    }
+}

res/css/views/messages/_MKeyVerificationRequest.scss

@@ -65,23 +65,6 @@ limitations under the License.
     .mx_KeyVerification_buttons {
         align-items: center;
         display: flex;
-
-        .mx_AccessibleButton_kind_decline {
-            color: $notice-primary-color;
-            background-color: $notice-primary-bg-color;
-        }
-
-        .mx_AccessibleButton_kind_accept {
-            color: $accent-color;
-            background-color: $accent-bg-color;
-        }
-
-        [role=button] {
-            margin: 10px;
-            padding: 7px 15px;
-            border-radius: 5px;
-            height: min-content;
-        }
     }
 
     .mx_KeyVerification_state {

res/css/views/rooms/_E2EIcon.scss

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 .mx_E2EIcon {
-    width: 25px;
-    height: 25px;
+    width: 16px;
+    height: 16px;
     margin: 0 9px;
     position: relative;
     display: block;
@@ -30,16 +30,14 @@ limitations under the License.
     bottom: 0;
     left: 0;
     right: 0;
-    mask-repeat: no-repeat;
-    mask-size: contain;
+    background-repeat: no-repeat;
+    background-size: contain;
 }
 
 .mx_E2EIcon_verified::after {
-    mask-image: url('$(res)/img/e2e/verified.svg');
-    background-color: $accent-color;
+    background-image: url('$(res)/img/e2e/verified.svg');
 }
 
 .mx_E2EIcon_warning::after {
-    mask-image: url('$(res)/img/e2e/warning.svg');
-    background-color: $warning-color;
+    background-image: url('$(res)/img/e2e/warning.svg');
 }

res/css/views/rooms/_MessageComposer.scss

@@ -74,8 +74,6 @@ limitations under the License.
 .mx_MessageComposer_e2eIcon.mx_E2EIcon {
     position: absolute;
     left: 60px;
-    width: 16px;
-    height: 16px;
     margin-right: 0; // Counteract the E2EIcon class
     margin-left: 3px; // Counteract the E2EIcon class
 }

res/css/views/rooms/_RoomHeader.scss

@@ -17,6 +17,10 @@ limitations under the License.
 .mx_RoomHeader {
     flex: 0 0 52px;
     border-bottom: 1px solid $primary-hairline-color;
+
+    .mx_E2EIcon {
+        margin: 0 5px;
+    }
 }
 
 .mx_RoomHeader_wrapper {