From 8735af4cbb2a7d0cc6d1ffa0e8a9450ed31bb867 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 28 Mar 2016 19:11:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(monitor)=20=E4=BF=AE=E5=A4=8D=E7=9B=91?= =?UTF-8?q?=E6=8E=A7-=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复实时监控-导致的换行,添加css .terminal { white-space: nowrap; display: inline-block; } --- templates/jlog/log_online.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/jlog/log_online.html b/templates/jlog/log_online.html index 890686306..ca1a3101c 100644 --- a/templates/jlog/log_online.html +++ b/templates/jlog/log_online.html @@ -9,8 +9,10 @@ background: rgba(0, 0, 0, 0.6); width: 600px; box-shadow: rgba(0, 0, 0, 0.6) 2px 2px 20px; - } + white-space: nowrap; + display: inline-block; + } .reverse-video { color: #000; background: #f0f0f0; From c95c76d0e0b6f030ca42537c35971cea03d50cb2 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 28 Mar 2016 19:14:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?change(web=20terminal)=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?web=20terminal=E9=81=87=E5=88=B0-=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加css white-space: nowrap; display: inline-block; 之前通过修改字体解决 --- templates/jlog/web_terminal.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/jlog/web_terminal.html b/templates/jlog/web_terminal.html index 86b50bc99..b5aae590d 100644 --- a/templates/jlog/web_terminal.html +++ b/templates/jlog/web_terminal.html @@ -17,6 +17,8 @@ background: #000; width: 600px; box-shadow: rgba(0, 0, 0, 0.8) 2px 2px 20px; + white-space: nowrap; + display: inline-block; } .reverse-video {