Merge pull request #169 from jumpserver/new-line-

New line

Merge pull request #169 from jumpserver/new-line-
New line
6e7e4d47 · ibuler · 3ca66291 · c95c76d0 · 6e7e4d47 · 6e7e4d47
Commit 6e7e4d47 authored Mar 28, 2016 by ibuler
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

log_online.html templates/jlog/log_online.html +3 -1

web_terminal.html templates/jlog/web_terminal.html +2 -0

No files found.
--- 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;

--- 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 {