Merge pull request #2034 from matrix-org/revert-1945-t3chguy/click_us…

…ername_state_ev Revert " make click to insert nick work on join/parts, /me's etc"
matrix-org · Jul 3, 2018 · f429ae5 · f429ae5
2 parents 767e67d + 7225f73
commit f429ae5
Show file tree

Hide file tree

Showing 39 changed files with 1,241 additions and 1,377 deletions.
diff --git a/res/css/_components.scss b/res/css/_components.scss
@@ -60,7 +60,6 @@
 @import "./views/elements/_RoleButton.scss";
 @import "./views/elements/_Spinner.scss";
 @import "./views/elements/_SyntaxHighlight.scss";
-@import "./views/elements/_TextForEvent.scss";
 @import "./views/elements/_ToolTipButton.scss";
 @import "./views/globals/_MatrixToolbar.scss";
 @import "./views/groups/_GroupPublicityToggle.scss";

diff --git a/res/css/views/elements/_TextForEvent.scss b/res/css/views/elements/_TextForEvent.scss
diff --git a/scripts/map-i18n.js b/scripts/map-i18n.js