Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share

res/css/views/rooms/_EventTile.scss

@@ -477,8 +477,7 @@ $hover-select-border: 4px;
 
     pre, code {
         font-family: $monospace-font-family !important;
-        // deliberate constants as we're behind an invert filter
-        color: #333;
+        background-color: $header-panel-bg-color;
     }
 
     pre {
@@ -488,11 +487,6 @@ $hover-select-border: 4px;
         overflow-x: overlay;
         overflow-y: visible;
     }
-
-    code {
-        // deliberate constants as we're behind an invert filter
-        background-color: #f8f8f8;
-    }
 }
 
 .mx_EventTile_lineNumbers {