From b3502a92919a863ed17fc031bd01d1437864998a Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 22 Oct 2019 19:30:39 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9terminal=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ops/templates/ops/celery_task_log.html   | 41 +++++++++++++++----
 .../ops/command_execution_create.html         | 26 ++++++++++--
 2 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/apps/ops/templates/ops/celery_task_log.html b/apps/ops/templates/ops/celery_task_log.html
index c7f177c6e..b048cddaf 100644
--- a/apps/ops/templates/ops/celery_task_log.html
+++ b/apps/ops/templates/ops/celery_task_log.html
@@ -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;
-        }
+        {#body {#}
+        {#    background-color: black;#}
+        {#}#}
+
+        {#.xterm-rows {#}
+        {#    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
         });
diff --git a/apps/ops/templates/ops/command_execution_create.html b/apps/ops/templates/ops/command_execution_create.html
index 9176c608d..cd1867c74 100644
--- a/apps/ops/templates/ops/command_execution_create.html
+++ b/apps/ops/templates/ops/command_execution_create.html
@@ -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'
                 }