Merge branch 'develop' into travis/mjolnir

res/css/views/messages/_MKeyVerificationRequest.scss

@@ -0,0 +1,93 @@
+/*
+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_KeyVerification {
+
+    display: grid;
+    grid-template-columns: 24px minmax(0, 1fr) min-content;
+
+    &.mx_KeyVerification_icon::after {
+        grid-column: 1;
+        grid-row: 1 / 3;
+        width: 12px;
+        height: 16px;
+        content: "";
+        mask: url("$(res)/img/e2e/verified.svg");
+        mask-repeat: no-repeat;
+        mask-size: 100%;
+        margin-top: 4px;
+        background-color: $primary-fg-color;
+    }
+
+    &.mx_KeyVerification_icon_verified::after {
+        background-color: $accent-color;
+    }
+
+    .mx_KeyVerification_title, .mx_KeyVerification_subtitle, .mx_KeyVerification_state {
+        overflow-wrap: break-word;
+    }
+
+    .mx_KeyVerification_title {
+        font-weight: 600;
+        font-size: 15px;
+        grid-column: 2;
+        grid-row: 1;
+    }
+
+    .mx_KeyVerification_subtitle {
+        grid-column: 2;
+        grid-row: 2;
+    }
+
+    .mx_KeyVerification_state, .mx_KeyVerification_subtitle {
+        font-size: 12px;
+    }
+
+    .mx_KeyVerification_state, .mx_KeyVerification_buttons {
+        grid-column: 3;
+        grid-row: 1 / 3;
+    }
+
+    .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 {
+        width: 130px;
+        padding: 10px 20px;
+        margin: auto 0;
+        text-align: center;
+        color: $notice-secondary-color;
+    }
+}