github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-04-08 13:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add new css class for code highlighting

Browse source 
Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
This commit is contained in:
Tilman Vatteroth 2021-09-16 21:07:27 +02:00
parent 6fe8967c44
commit fa82368dfd
4 changed files with 45 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cypress/integration/autocompletion.spec.ts
View file

@ -26,9 +26,7 @@ describe('Autocompletion', () => {
.should('have.text', '```abnf')
cy.get('.CodeMirror-code > div:nth-of-type(3) > .CodeMirror-line > span span')
.should('have.text', '```')
cy.getMarkdownBody()
.find('pre > code')
.should('exist')
cy.getMarkdownBody().find('.code-highlighter').should('exist')
})
it('via doubleclick', () => {
cy.codemirrorFill('```')
@ -41,9 +39,7 @@ describe('Autocompletion', () => {
.should('have.text', '```abnf')
cy.get('.CodeMirror-code > div:nth-of-type(3) > .CodeMirror-line > span span')
.should('have.text', '```')
cy.getMarkdownBody()
.find('pre > code')
.should('exist')
cy.getMarkdownBody().find('.code-highlighter').should('exist')
})
})

4
cypress/integration/highlightedCodeBlock.spec.ts
View file

@ -5,9 +5,7 @@
*/
const findHljsCodeBlock = () => {
return cy.getMarkdownBody()
.find('pre > code.hljs')
.should('be.visible')
return cy.getMarkdownBody().find('.code-highlighter > code.hljs').should('be.visible')
}
describe('Code', () => {

82
src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.scss
View file

@ -4,62 +4,60 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
.markdown-body {
.code-highlighter {
@import '../../../../../../node_modules/highlight.js/styles/github';
body.dark & {
@import '../../../../../../node_modules/highlight.js/styles/github-dark';
}
pre, & {
code.hljs {
overflow-x: auto;
background-color: rgba(27, 31, 35, .05);
code.hljs {
overflow-x: auto;
background-color: rgba(27, 31, 35, .05);
body.dark & {
background-color: rgb(27, 31, 35);
body.dark & {
background-color: rgb(27, 31, 35);
}
body.dark &, & {
padding: 16px;
display: grid;
grid-template-columns: auto minmax(0, 1fr);
.codeline {
grid-column: 2;
white-space: pre;
}
body.dark &, & {
padding: 16px;
display: grid;
grid-template-columns: auto minmax(0, 1fr);
.codeline {
grid-column: 2;
white-space: pre;
}
.linenumber {
grid-column: 1;
position: relative;
cursor: default;
z-index: 4;
padding: 0 8px 0 0;
min-width: 20px;
box-sizing: content-box;
color: #afafaf;
border-right: 3px solid #6ce26c;
flex-direction: column;
overflow: hidden;
user-select: none;
align-items: flex-end;
display: none;
}
&.showGutter {
.linenumber {
grid-column: 1;
position: relative;
cursor: default;
z-index: 4;
padding: 0 8px 0 0;
min-width: 20px;
box-sizing: content-box;
color: #afafaf;
border-right: 3px solid #6ce26c;
flex-direction: column;
overflow: hidden;
user-select: none;
align-items: flex-end;
display: none;
display: flex;
}
}
&.showGutter {
.linenumber {
display: flex;
}
}
&.showGutter .codeline {
margin: 0 0 0 16px;
}
&.showGutter .codeline {
margin: 0 0 0 16px;
}
&.wrapLines .codeline {
white-space: pre-wrap;
}
&.wrapLines .codeline {
white-space: pre-wrap;
}
}
}

4
src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.tsx
View file

@ -61,14 +61,14 @@ export const HighlightedCode: React.FC<HighlightedCodeProps> = ({ code, language
}, [code, language, startLineNumber])
return (
<Fragment>
<div className={'code-highlighter'}>
<code className={`hljs ${startLineNumber !== undefined ? 'showGutter' : ''} ${wrapLines ? 'wrapLines' : ''}`}>
{dom}
</code>
<div className={'text-right button-inside'}>
<CopyToClipboardButton content={code} data-cy='copy-code-button' />
</div>
</Fragment>
</div>
)
}