Merge branch 'develop' into DisambiguatedProfile

Author: luixxiul

.eslintrc.js

@@ -86,6 +86,8 @@ module.exports = {
         "jsx-a11y/no-static-element-interactions": "off",
         "jsx-a11y/role-supports-aria-props": "off",
         "jsx-a11y/tabindex-no-positive": "off",
+
+        "matrix-org/require-copyright-header": "error",
     },
     overrides: [
         {

package.json

@@ -173,7 +173,7 @@
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-matrix-org": "^0.4.0",
+    "eslint-plugin-matrix-org": "^0.5.2",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "fs-extra": "^10.0.1",

res/css/_components.scss

@@ -126,7 +126,6 @@
 @import "./views/dialogs/_SpacePreferencesDialog.scss";
 @import "./views/dialogs/_SpaceSettingsDialog.scss";
 @import "./views/dialogs/_SpotlightDialog.scss";
-@import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
 @import "./views/dialogs/_TermsDialog.scss";
 @import "./views/dialogs/_UntrustedDeviceDialog.scss";
 @import "./views/dialogs/_UploadConfirmDialog.scss";

res/css/views/dialogs/_MessageEditHistoryDialog.scss

@@ -55,6 +55,12 @@ limitations under the License.
         text-decoration: underline;
     }
 
+    .mx_EventTile {
+        .mx_MessageTimestamp {
+            position: absolute;
+        }
+    }
+
     .mx_EventTile_line, .mx_EventTile_content {
         margin-right: 0px;
     }

res/css/views/dialogs/_TabbedIntegrationManagerDialog.scss

@@ -58,7 +58,6 @@ limitations under the License.
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
-        max-width: calc(100% - 1ch);
         text-decoration: none !important; // To override .markdown-body
     }
 }

res/css/views/elements/_Pill.scss

@@ -35,3 +35,10 @@
 .mx_Markdown_STRIKETHROUGH {
     text-decoration: line-through;
 }
+
+.mx_Emoji {
+    // Should be 1.8rem for our default message bodies, and scale with the
+    // surrounding text
+    font-size: max($font-18px, 1em);
+    vertical-align: bottom;
+}

res/css/views/elements/_RichText.scss

@@ -15,7 +15,10 @@ limitations under the License.
 */
 
 .mx_MLocationBody {
+    max-width: 100%;
+
     .mx_MLocationBody_map {
+        max-width: 100%;
         width: 450px;
         height: 300px;
         z-index: 0; // keeps the entire map under the message action bar
@@ -27,15 +30,11 @@ limitations under the License.
 
 /* In the timeline, we fit the width of the container */
 .mx_EventTile_line .mx_MLocationBody .mx_MLocationBody_map {
-    width: 100%;
     max-width: 450px;
+    width: 100%;
 }
 
-.mx_EventTile[data-layout="bubble"] .mx_EventTile_line .mx_MLocationBody {
+.mx_EventTile[data-layout="bubble"] .mx_EventTile_line .mx_MLocationBody .mx_MLocationBody_map {
     max-width: 100%;
-
-    .mx_MLocationBody_map {
-        max-width: 100%;
-        width: 450px;
-    }
+    width: 450px;
 }

res/css/views/messages/_MLocationBody.scss

@@ -18,4 +18,5 @@ limitations under the License.
     color: $event-timestamp-color;
     font-size: $font-10px;
     font-variant-numeric: tabular-nums;
+    width: $MessageTimestamp_width;
 }

res/css/views/messages/_MessageTimestamp.scss

@@ -17,6 +17,7 @@ limitations under the License.
 .mx_TextualEvent {
     opacity: 0.5;
     overflow-y: hidden;
+    line-height: normal;
 
     a {
         color: $accent;