From adedf23cfb8e94894e5dc8ded2a031160007da63 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 4 Nov 2017 22:19:06 +0000
Subject: [PATCH] remove unnamespaced CSS fail

---
 src/components/views/globals/NewVersionBar.js                | 2 +-
 src/skins/vector/css/_common.scss                            | 5 -----
 .../vector/css/vector-web/views/globals/_MatrixToolbar.scss  | 4 ++++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js
index f56d1a51b7..2aedf39204 100644
--- a/src/components/views/globals/NewVersionBar.js
+++ b/src/components/views/globals/NewVersionBar.js
@@ -42,7 +42,7 @@ export default React.createClass({
         const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
         Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
             title: _t("What's New"),
-            description: <pre className="changelog_text">{releaseNotes}</pre>,
+            description: <div className="mx_MatrixToolbar_changelog">{releaseNotes}</div>,
             button: _t("Update"),
             onFinished: (update) => {
                 if(update && PlatformPeg.get()) {
diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss
index c1eb8fab00..570439543a 100644
--- a/src/skins/vector/css/_common.scss
+++ b/src/skins/vector/css/_common.scss
@@ -294,11 +294,6 @@ textarea {
     margin-top: 69px;
 }
 
-.changelog_text {
-    // why on earth is this needed? and with the wrong namespacing? >:(
-    font-family: $font-family;
-}
-
 .mx_Beta {
     color: red;
     margin-right: 10px;
diff --git a/src/skins/vector/css/vector-web/views/globals/_MatrixToolbar.scss b/src/skins/vector/css/vector-web/views/globals/_MatrixToolbar.scss
index 1a7b1c1646..be69b15f37 100644
--- a/src/skins/vector/css/vector-web/views/globals/_MatrixToolbar.scss
+++ b/src/skins/vector/css/vector-web/views/globals/_MatrixToolbar.scss
@@ -56,3 +56,7 @@ limitations under the License.
 .mx_MatrixToolbar_action {
     margin-right: 16px;
 }
+
+.mx_MatrixToolbar_changelog {
+    white-space: pre;
+}
\ No newline at end of file