Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-23 16:59:48 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/feature/annotate_prismjs' into feature/syntax-highlighting

Browse Source 
# Conflicts:
#	package.json
#	scm-ui/eslint-config/package.json
#	scm-ui/ui-components/src/SyntaxHighlighter.tsx
#	scm-ui/ui-components/src/repos/annotate/Annotate.tsx
#	scm-ui/ui-plugins/package.json
#	yarn.lock
This commit is contained in:
Konstantin Schaper
2020-10-12 11:23:56 +02:00
parent 0b0df4ed5f a4e6e4186a
commit a043e7f805
6 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-ui/ui-components/src/SyntaxHighlighter.tsx
View File

@@ -23,9 +23,8 @@
*/
import React from "react";
import { LightAsync as ReactSyntaxHighlighter } from "react-syntax-highlighter";
// @ts-ignore
import { arduinoLight } from "react-syntax-highlighter/dist/cjs/styles/hljs";
import { PrismAsyncLight as ReactSyntaxHighlighter } from "react-syntax-highlighter";
import { ghcolors } from "react-syntax-highlighter/dist/esm/styles/prism";
type Props = {
language?: string;
@@ -53,7 +52,7 @@ class SyntaxHighlighter extends React.Component<Props> {
const { showLineNumbers } = this.props;
const language = this.getLanguage();
return (
<ReactSyntaxHighlighter showLineNumbers={showLineNumbers} language={language} style={arduinoLight}>
<ReactSyntaxHighlighter showLineNumbers={showLineNumbers} language={language} style={ghcolors}>
{this.props.value}
</ReactSyntaxHighlighter>
);