Merge remote-tracking branch 'origin/develop' into dbkr/call_hold

res/css/_components.scss

@@ -70,11 +70,13 @@
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
 @import "./views/dialogs/_EditCommunityPrototypeDialog.scss";
+@import "./views/dialogs/_FeedbackDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";
 @import "./views/dialogs/_KeyboardShortcutsDialog.scss";
 @import "./views/dialogs/_MessageEditHistoryDialog.scss";
+@import "./views/dialogs/_ModalWidgetDialog.scss";
 @import "./views/dialogs/_NewSessionReviewDialog.scss";
 @import "./views/dialogs/_RoomSettingsDialog.scss";
 @import "./views/dialogs/_RoomSettingsDialogBridges.scss";

res/css/structures/_CustomRoomTagPanel.scss

@@ -16,11 +16,6 @@ limitations under the License.
 
 // TODO: Update design for custom tags to match new designs
 
-.mx_LeftPanel_tagPanelContainer {
-    display: flex;
-    flex-direction: column;
-}
-
 .mx_CustomRoomTagPanel {
     background-color: $groupFilterPanel-bg-color;
     max-height: 40vh;

res/css/structures/_LeftPanel.scss

@@ -32,6 +32,7 @@ $groupFilterPanelWidth: 56px; // only applies in this file, used for calculation
 
         // Create another flexbox so the GroupFilterPanel fills the container
         display: flex;
+        flex-direction: column;
 
         // GroupFilterPanel handles its own CSS
     }

res/css/views/dialogs/_FeedbackDialog.scss

@@ -0,0 +1,121 @@
+/*
+Copyright 2020 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_FeedbackDialog {
+    hr {
+        margin: 24px 0;
+        border-color: $input-border-color;
+    }
+
+    .mx_Dialog_content {
+        margin-bottom: 24px;
+
+        > h2 {
+            margin-bottom: 32px;
+        }
+    }
+
+    .mx_FeedbackDialog_section {
+        position: relative;
+        padding-left: 52px;
+
+        > p {
+            color: $tertiary-fg-color;
+        }
+
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+            font-size: inherit;
+        }
+
+        a, .mx_AccessibleButton_kind_link {
+            color: $accent-color;
+            text-decoration: underline;
+        }
+
+        &::before, &::after {
+            content: "";
+            position: absolute;
+            width: 40px;
+            height: 40px;
+            left: 0;
+            top: 0;
+        }
+
+        &::before {
+            background-color: $icon-button-color;
+            border-radius: 20px;
+        }
+
+        &::after {
+            background: $avatar-initial-color; // TODO
+            mask-position: center;
+            mask-size: 24px;
+            mask-repeat: no-repeat;
+        }
+    }
+
+    .mx_FeedbackDialog_reportBug {
+        &::after {
+            mask-image: url('$(res)/img/feather-customised/bug.svg');
+        }
+    }
+
+    .mx_FeedbackDialog_rateApp {
+        .mx_RadioButton {
+            display: inline-flex;
+            font-size: 20px;
+            transition: font-size 1s, border .5s;
+            border-radius: 50%;
+            border: 2px solid transparent;
+            margin-top: 12px;
+            margin-bottom: 24px;
+            vertical-align: top;
+            cursor: pointer;
+
+            input[type="radio"] + div {
+                display: none;
+            }
+
+            .mx_RadioButton_content {
+                background: $icon-button-color;
+                width: 40px;
+                height: 40px;
+                text-align: center;
+                line-height: 40px;
+                border-radius: 20px;
+                margin: 5px;
+            }
+
+            .mx_RadioButton_spacer {
+                display: none;
+            }
+
+            & + .mx_RadioButton {
+                margin-left: 16px;
+            }
+        }
+
+        .mx_RadioButton_checked {
+            font-size: 24px;
+            border-color: $accent-color;
+        }
+
+        &::after {
+            mask-image: url('$(res)/img/element-icons/feedback.svg');
+        }
+    }
+}

res/css/views/dialogs/_ModalWidgetDialog.scss

@@ -0,0 +1,42 @@
+/*
+Copyright 2020 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_ModalWidgetDialog {
+    .mx_ModalWidgetDialog_warning {
+        margin-bottom: 24px;
+
+        > img {
+            vertical-align: middle;
+            margin-right: 8px;
+        }
+    }
+
+    .mx_ModalWidgetDialog_buttons {
+        float: right;
+        margin-top: 24px;
+
+        .mx_AccessibleButton + .mx_AccessibleButton {
+            margin-left: 8px;
+        }
+    }
+
+    iframe {
+        width: 100%;
+        height: 450px;
+        border: 0;
+        border-radius: 8px;
+    }
+}

res/css/views/elements/_AccessibleButton.scss

@@ -25,7 +25,7 @@ limitations under the License.
 .mx_AccessibleButton_hasKind {
     padding: 7px 18px;
     text-align: center;
-    border-radius: 4px;
+    border-radius: 8px;
     display: inline-block;
     font-size: $font-14px;
 }