diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css index 8ecd85b69..788cda8c0 100644 --- a/apps/client/src/stylesheets/style.css +++ b/apps/client/src/stylesheets/style.css @@ -521,9 +521,7 @@ body.mobile .dropdown .dropdown-submenu > span { .cm-editor { height: 100%; outline: none !important; - border-radius: 6px; overflow: hidden; - margin: 4px; font-size: var(--monospace-font-size); } @@ -629,6 +627,10 @@ pre:not(.hljs) { padding: var(--padding-size); } +pre:has(> .cm-editor) { + padding: 0; +} + pre > button.copy-button { position: absolute; top: var(--copy-button-margin-size); diff --git a/apps/client/src/widgets/type_widgets/code/BackendLog.tsx b/apps/client/src/widgets/type_widgets/code/BackendLog.tsx index f045ed562..64cc264c3 100644 --- a/apps/client/src/widgets/type_widgets/code/BackendLog.tsx +++ b/apps/client/src/widgets/type_widgets/code/BackendLog.tsx @@ -1,10 +1,12 @@ -import { useEffect, useRef, useState } from "preact/hooks"; import "./code.css"; -import { CodeEditor } from "./Code"; + import CodeMirror from "@triliumnext/codemirror"; +import { useEffect, useRef, useState } from "preact/hooks"; + import server from "../../../services/server"; import { useTriliumEvent } from "../../react/hooks"; import { TypeWidgetProps } from "../type_widget"; +import { CodeEditor } from "./Code"; export default function BackendLog({ ntxId, parentComponent }: TypeWidgetProps) { const [ content, setContent ] = useState(); @@ -40,5 +42,5 @@ export default function BackendLog({ ntxId, parentComponent }: TypeWidgetProps) preferPerformance /> - ) + ); }