diff --git a/spug_web/src/components/ACEditor.js b/spug_web/src/components/ACEditor.js index 40ec4d5..5f27188 100644 --- a/spug_web/src/components/ACEditor.js +++ b/spug_web/src/components/ACEditor.js @@ -13,7 +13,7 @@ import 'ace-builds/src-noconflict/mode-python'; import 'ace-builds/src-noconflict/theme-tomorrow'; export default function (props) { - const style = {fontFamily: 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei', ...props.style} + const style = {fontFamily: 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei', ...props.style} return ( fitPlugin.fit() diff --git a/spug_web/src/pages/deploy/request/OutView.js b/spug_web/src/pages/deploy/request/OutView.js index 1833974..277333c 100644 --- a/spug_web/src/pages/deploy/request/OutView.js +++ b/spug_web/src/pages/deploy/request/OutView.js @@ -14,7 +14,7 @@ function OutView(props) { setTimeout(() => { const fitPlugin = new FitAddon() const term = new Terminal({disableStdin: true}) - term.setOption('fontFamily', 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei') + term.setOption('fontFamily', 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei') term.loadAddon(fitPlugin) term.setOption('theme', {background: '#fff', foreground: '#000', selection: '#999'}) term.open(el.current) diff --git a/spug_web/src/pages/exec/task/Output.js b/spug_web/src/pages/exec/task/Output.js index 75e33ff..3ba9233 100644 --- a/spug_web/src/pages/exec/task/Output.js +++ b/spug_web/src/pages/exec/task/Output.js @@ -31,7 +31,7 @@ function OutView(props) { gCurrent = current const fitPlugin = new FitAddon() term.setOption('disableStdin', false) - term.setOption('fontFamily', 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei') + term.setOption('fontFamily', 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei') term.setOption('theme', {background: '#f0f0f0', foreground: '#000', selection: '#999', cursor: '#f0f0f0'}) term.loadAddon(fitPlugin) term.open(el.current) diff --git a/spug_web/src/pages/ssh/FileManager.js b/spug_web/src/pages/ssh/FileManager.js index 95baed6..114cb02 100644 --- a/spug_web/src/pages/ssh/FileManager.js +++ b/spug_web/src/pages/ssh/FileManager.js @@ -234,7 +234,7 @@ class FileManager extends React.Component { pagination={false} columns={this.columns} scroll={{y: scrollY}} - bodyStyle={{fontFamily: "'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace"}} + style={{fontFamily: 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei'}} dataSource={objects}/> ) diff --git a/spug_web/src/pages/ssh/Terminal.js b/spug_web/src/pages/ssh/Terminal.js index fd0eb80..7757b6a 100644 --- a/spug_web/src/pages/ssh/Terminal.js +++ b/spug_web/src/pages/ssh/Terminal.js @@ -18,7 +18,7 @@ function WebSSH(props) { useEffect(() => { const fitPlugin = new FitAddon(); term.loadAddon(fitPlugin); - term.setOption('fontFamily', 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei') + term.setOption('fontFamily', 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei') term.open(container.current); term.write('WebSocket connecting ... '); const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';