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

res/css/structures/_LeftPanel.scss

@@ -19,6 +19,7 @@ limitations under the License.
     display: flex;
     /* LeftPanel 260px */
     min-width: 260px;
+    max-width: 50%;
     flex: 0 0 auto;
 }
 

res/css/structures/_RightPanel.scss

@@ -20,6 +20,7 @@ limitations under the License.
     flex: 0 0 auto;
     position: relative;
     min-width: 264px;
+    max-width: 50%;
     display: flex;
     flex-direction: column;
 }
@@ -67,22 +68,27 @@ limitations under the License.
 
 .mx_RightPanel_membersButton::before {
     mask-image: url('$(res)/img/feather-customised/user.svg');
+    mask-position: center;
 }
 
 .mx_RightPanel_filesButton::before {
     mask-image: url('$(res)/img/feather-customised/files.svg');
+    mask-position: center;
 }
 
 .mx_RightPanel_notifsButton::before {
     mask-image: url('$(res)/img/feather-customised/notifications.svg');
+    mask-position: center;
 }
 
 .mx_RightPanel_groupMembersButton::before {
     mask-image: url('$(res)/img/icons-people.svg');
+    mask-position: center;
 }
 
 .mx_RightPanel_roomsButton::before {
     mask-image: url('$(res)/img/icons-room-nobg.svg');
+    mask-position: center;
 }
 
 .mx_RightPanel_headerButton_highlight::after {

res/css/views/elements/_AddressSelector.scss

@@ -23,6 +23,7 @@ limitations under the License.
     border-radius: 3px;
     border: solid 1px $accent-color;
     cursor: pointer;
+    z-index: 1;
 }
 
 .mx_AddressSelector.mx_AddressSelector_empty {

res/css/views/rooms/_GroupLayout.scss

@@ -18,7 +18,6 @@ limitations under the License.
 $left-gutter: 65px;
 
 .mx_GroupLayout {
-
     .mx_EventTile {
         > .mx_SenderProfile {
             line-height: $font-17px;
@@ -53,14 +52,14 @@ $left-gutter: 65px;
 /* Compact layout overrides */
 
 .mx_MatrixChat_useCompactLayout {
-    .mx_EventTile_line, .mx_EventTile_reply {
-        padding-top: 0px;
-        padding-bottom: 0px;
-    }
-
     .mx_EventTile {
         padding-top: 4px;
 
+        .mx_EventTile_line, .mx_EventTile_reply {
+            padding-top: 0;
+            padding-bottom: 0;
+        }
+
         &.mx_EventTile_info {
             // same as the padding for non-compact .mx_EventTile.mx_EventTile_info
             padding-top: 0px;

res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss

@@ -63,4 +63,25 @@ limitations under the License.
             font-size: inherit;
         }
     }
+
+    .mx_SecurityUserSettingsTab_warning {
+        color: $notice-primary-color;
+        position: relative;
+        padding-left: 40px;
+        margin-top: 30px;
+
+        &::before {
+            mask-repeat: no-repeat;
+            mask-position: 0 center;
+            mask-size: $font-24px;
+            position: absolute;
+            width: $font-24px;
+            height: $font-24px;
+            content: "";
+            top: 0;
+            left: 0;
+            background-color: $notice-primary-color;
+            mask-image: url('$(res)/img/feather-customised/alert-triangle.svg');
+        }
+    }
 }

res/img/feather-customised/alert-triangle.svg

@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.29 3.86002L1.82002 18C1.46466 18.6154 1.46254 19.3732 1.81445 19.9905C2.16635 20.6079 2.81943 20.9922 3.53002 21H20.47C21.1806 20.9922 21.8337 20.6079 22.1856 19.9905C22.5375 19.3732 22.5354 18.6154 22.18 18L13.71 3.86002C13.3475 3.2623 12.6991 2.89728 12 2.89728C11.3009 2.89728 10.6526 3.2623 10.29 3.86002Z" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 9V13" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="12" cy="17" r="1" fill="#2E2F32"/>
+</svg>

res/img/files.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="22px" viewBox="0 0 17 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: bin/sketchtool 1.4 (305) - http://www.bohemiancoding.com/sketch -->
-    <title>icons_browse_files</title>
-    <desc>Created with bin/sketchtool.</desc>
-    <defs></defs>
-    <g id="02-Chat" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="02_13-Chat-member-profile" sketch:type="MSArtboardGroup" transform="translate(-1025.000000, -33.000000)">
-            <g id="icons_browse_files" sketch:type="MSLayerGroup" transform="translate(1025.000000, 32.000000)">
-                <g id="Rectangle-5-+-Rectangle-6-Copy" transform="translate(0.000000, 1.000000)" sketch:type="MSShapeGroup">
-                    <path d="M0,4.00955791 C0,1.79514022 1.78163126,0 3.99825563,0 L9.59161955,0 C9.59161955,0 16.3225806,6.49234232 16.3225806,6.49234232 L16.3225806,18.0063928 C16.3225806,20.2120012 14.5290874,22 12.3296282,22 L3.99295243,22 C1.7877057,22 0,20.1996477 0,17.9904421 L0,4.00955791 Z" id="Rectangle-5" stroke="#76CFA6"></path>
-                    <path d="M15.6804916,7.49527496 L11.5273266,7.49527496 C10.3308881,7.49527496 9.3609831,6.52527676 9.3609831,5.3289315 L9.3609831,1.88544393 L15.6804916,7.49527496 Z" id="Rectangle-6-Copy" fill="#FFFFFF"></path>
-                    <path d="M16.3225806,7.09677419 L11.4129801,7.09677419 C10.2050375,7.09677419 9.22580645,6.11744908 9.22580645,4.90960051 L9.22580645,0" id="Rectangle-6" stroke="#76CFA6"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>