diff --git a/src/components/views/elements/Highlight.js b/src/components/views/elements/Highlight.js
new file mode 100644
index 0000000000..1251264e37
--- /dev/null
+++ b/src/components/views/elements/Highlight.js
@@ -0,0 +1,51 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {highlightBlock} from 'highlight.js';
+
+export default class Highlight extends React.Component {
+ static propTypes = {
+ className: PropTypes.string,
+ children: PropTypes.node,
+ };
+
+ constructor(props, context) {
+ super(props, context);
+
+ this._ref = this._ref.bind(this);
+ }
+
+ componentDidUpdate() {
+ if (this._el) highlightBlock(this._el);
+ }
+
+ _ref(el) {
+ this._el = el;
+ this.componentDidUpdate();
+ }
+
+ render() {
+ const { className, children } = this.props;
+
+ return
+ { children }
+
;
+ }
+}
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 0dd6a1b1b7..c01a7dcf85 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -91,6 +91,7 @@
@import "./vector-web/views/dialogs/_SetEmailDialog.scss";
@import "./vector-web/views/dialogs/_SetPasswordDialog.scss";
@import "./vector-web/views/directory/_NetworkDropdown.scss";
+@import "./vector-web/views/elements/_Highlight.scss";
@import "./vector-web/views/elements/_ImageView.scss";
@import "./vector-web/views/elements/_InlineSpinner.scss";
@import "./vector-web/views/elements/_Spinner.scss";
diff --git a/src/skins/vector/css/vector-web/views/elements/_Highlight.scss b/src/skins/vector/css/vector-web/views/elements/_Highlight.scss
new file mode 100644
index 0000000000..9b35844ffa
--- /dev/null
+++ b/src/skins/vector/css/vector-web/views/elements/_Highlight.scss
@@ -0,0 +1,21 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_Highlight {
+ /* inhibit hljs styling */
+ background: none !important;
+ color: $light-fg-color !important;
+}
From 4386d45a972802d48d81d3016fdfd3a50a55ee87 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 16 Jan 2018 10:27:47 +0000
Subject: [PATCH 2/5] remove 'use strict'
---
src/components/views/elements/Highlight.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/components/views/elements/Highlight.js b/src/components/views/elements/Highlight.js
index 1251264e37..8706bb05a5 100644
--- a/src/components/views/elements/Highlight.js
+++ b/src/components/views/elements/Highlight.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
import React from 'react';
import PropTypes from 'prop-types';
import {highlightBlock} from 'highlight.js';
From f5fc86258fc039c8f18e45cffb8770d0f827026a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Jan 2018 18:59:18 +0000
Subject: [PATCH 3/5] s/Highlight/SyntaxHighlight/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/ViewSource.js | 6 +++---
src/components/views/dialogs/DevtoolsDialog.js | 10 +++++-----
.../elements/{Highlight.js => SyntaxHighlight.js} | 4 ++--
src/skins/vector/css/_components.scss | 2 +-
.../{_Highlight.scss => _SyntaxHighlight.scss} | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
rename src/components/views/elements/{Highlight.js => SyntaxHighlight.js} (89%)
rename src/skins/vector/css/vector-web/views/elements/{_Highlight.scss => _SyntaxHighlight.scss} (96%)
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index 8f60ae886c..3a5d35a561 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -18,7 +18,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
-import Highlight from '../views/elements/Highlight';
+import SyntaxHighlight from '../views/elements/SyntaxHighlight';
module.exports = React.createClass({
@@ -48,9 +48,9 @@ module.exports = React.createClass({
render: function() {
return (