github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3370 from jumpserver/bugfix 

Bugfix
pull/3374/head
老广 2019-10-22 19:33:01 +08:00 committed by GitHub
parent c3f02dbaab 6b8b0f4a0b
commit 22cc8ffbdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/ops/templates/ops/celery_task_log.html
View File

@ -6,15 +6,37 @@
<script src="{% static 'js/plugins/xterm/xterm.js' %}"></script>
<script src="{% static 'js/plugins/xterm/addons/fit/fit.js' %}"></script>
<link rel="stylesheet" href="{% static 'js/plugins/xterm/xterm.css' %}" />
<link rel="shortcut icon" href="{{ FAVICON_URL }}" type="image/x-icon">
<style>
body {
background-color: black;
}
.xterm-rows {
{#padding: 15px;#}
font-family: "Bitstream Vera Sans Mono", Monaco, "Consolas", Courier, monospace;
font-size: 13px;
}
.terminal .xterm-viewport {
background-color: #1f1b1b;
overflow: auto;
}
body ::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3);
background-color: #272323;
border-radius: 6px;
}
body ::-webkit-scrollbar {
width: 8px;
height: 8px;
}
body ::-webkit-scrollbar-thumb {
background-color: #494141;
border-radius: 6px;
}
</style>
</head>
<div id="term" style="height: 100%;width: 100%">
@ -36,7 +58,8 @@
cursorBlink: false,
screenKeys: false,
fontFamily: '"Monaco", "Consolas", "monospace"',
fontSize: 12,
fontSize: 13,
lineHeight: 1.2,
rightClickSelectsWord: true,
disableStdin: true
});

26
apps/ops/templates/ops/command_execution_create.html
View File

@ -34,6 +34,27 @@
.select2-container .select2-selection--single {
height: 34px;
}
.terminal .xterm-viewport {
background-color: #1f1b1b;
overflow: auto;
}
body ::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3);
background-color: #272323;
border-radius: 6px;
}
body ::-webkit-scrollbar {
width: 8px;
height: 8px;
}
body ::-webkit-scrollbar-thumb {
background-color: #494141;
border-radius: 6px;
}
</style>
{% endblock %}
@ -201,11 +222,10 @@
cursorBlink: false,
screenKeys: false,
fontFamily: 'monaco, Consolas, "Lucida Console", monospace',
fontSize: 14,
lineHeight: 1,
fontSize: 13,
rightClickSelectsWord: true,
disableStdin: true,
cursorBlink: false,
lineHeight: 1.2,
theme: {
background: '#1f1b1b'
}