OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

s/Highlight/SyntaxHighlight/ 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/5995/head
Michael Telatynski 2018-01-22 18:59:18 +00:00
parent 3764a5d4b7
commit f5fc86258f
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/ViewSource.js
View File

@ -18,7 +18,7 @@ limitations under the License.
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import Highlight from '../views/elements/Highlight'; import SyntaxHighlight from '../views/elements/SyntaxHighlight';
module.exports = React.createClass({ module.exports = React.createClass({
@ -48,9 +48,9 @@ module.exports = React.createClass({
render: function() { render: function() {
return ( return (
<div className="mx_ViewSource"> <div className="mx_ViewSource">
<Highlight className="json"> <SyntaxHighlight className="json">
{ JSON.stringify(this.props.content, null, 2) } { JSON.stringify(this.props.content, null, 2) }
</Highlight> </SyntaxHighlight>
</div> </div>
); );
} }

10
src/components/views/dialogs/DevtoolsDialog.js
View File

@ -17,7 +17,7 @@ limitations under the License.
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import sdk from 'matrix-react-sdk'; import sdk from 'matrix-react-sdk';
import Highlight from '../elements/Highlight'; import SyntaxHighlight from '../elements/SyntaxHighlight';
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
@ -344,9 +344,9 @@ class RoomStateExplorer extends DevtoolsComponent {
return <div className="mx_ViewSource"> return <div className="mx_ViewSource">
<div className="mx_Dialog_content"> <div className="mx_Dialog_content">
<Highlight className="json"> <SyntaxHighlight className="json">
{ JSON.stringify(this.state.event.event, null, 2) } { JSON.stringify(this.state.event.event, null, 2) }
</Highlight> </SyntaxHighlight>
</div> </div>
<div className="mx_Dialog_buttons"> <div className="mx_Dialog_buttons">
<button onClick={this.onBack}>{ _t('Back') }</button> <button onClick={this.onBack}>{ _t('Back') }</button>
@ -462,9 +462,9 @@ class AccountDataExplorer extends DevtoolsComponent {
return <div className="mx_ViewSource"> return <div className="mx_ViewSource">
<div className="mx_Dialog_content"> <div className="mx_Dialog_content">
<Highlight className="json"> <SyntaxHighlight className="json">
{ JSON.stringify(this.state.event.event, null, 2) } { JSON.stringify(this.state.event.event, null, 2) }
</Highlight> </SyntaxHighlight>
</div> </div>
<div className="mx_Dialog_buttons"> <div className="mx_Dialog_buttons">
<button onClick={this.onBack}>{ _t('Back') }</button> <button onClick={this.onBack}>{ _t('Back') }</button>

4
src/components/views/elements/Highlight.js → src/components/views/elements/SyntaxHighlight.js
View File

@ -18,7 +18,7 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import {highlightBlock} from 'highlight.js'; import {highlightBlock} from 'highlight.js';
export default class Highlight extends React.Component { export default class SyntaxHighlight extends React.Component {
static propTypes = { static propTypes = {
className: PropTypes.string, className: PropTypes.string,
children: PropTypes.node, children: PropTypes.node,
@ -42,7 +42,7 @@ export default class Highlight extends React.Component {
render() { render() {
const { className, children } = this.props; const { className, children } = this.props;
return <pre className={`${className} mx_Highlight`} ref={this._ref}> return <pre className={`${className} mx_SyntaxHighlight`} ref={this._ref}>
<code>{ children }</code> <code>{ children }</code>
</pre>; </pre>;
} }

2
src/skins/vector/css/_components.scss
View File

@ -93,7 +93,7 @@
@import "./vector-web/views/dialogs/_SetEmailDialog.scss"; @import "./vector-web/views/dialogs/_SetEmailDialog.scss";
@import "./vector-web/views/dialogs/_SetPasswordDialog.scss"; @import "./vector-web/views/dialogs/_SetPasswordDialog.scss";
@import "./vector-web/views/directory/_NetworkDropdown.scss"; @import "./vector-web/views/directory/_NetworkDropdown.scss";
@import "./vector-web/views/elements/_Highlight.scss"; @import "./vector-web/views/elements/_SyntaxHighlight.scss";
@import "./vector-web/views/elements/_ImageView.scss"; @import "./vector-web/views/elements/_ImageView.scss";
@import "./vector-web/views/elements/_InlineSpinner.scss"; @import "./vector-web/views/elements/_InlineSpinner.scss";
@import "./vector-web/views/elements/_Spinner.scss"; @import "./vector-web/views/elements/_Spinner.scss";

2
src/skins/vector/css/vector-web/views/elements/_Highlight.scss → src/skins/vector/css/vector-web/views/elements/_SyntaxHighlight.scss
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_Highlight { .mx_SyntaxHighlight {
/* inhibit hljs styling */ /* inhibit hljs styling */
background: none !important; background: none !important;
color: $light-fg-color !important; color: $light-fg-color !important;