From 0ae4b803cf687c5e3a7c3e9924851238bc20dfab Mon Sep 17 00:00:00 2001 From: paris Date: Mon, 24 Mar 2014 16:35:10 +0000 Subject: [PATCH] Moved some styling from xterm.js to xterm.css --- demo/index.html | 1 + demo/style.css | 7 +++++-- src/xterm.css | 43 +++++++++++++++++++++++++++++++++++++++++++ src/xterm.js | 3 --- 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 src/xterm.css diff --git a/demo/index.html b/demo/index.html index 369b9626..36016c1d 100644 --- a/demo/index.html +++ b/demo/index.html @@ -2,6 +2,7 @@ xterm.js demo + diff --git a/demo/style.css b/demo/style.css index ff123856..7ed117b2 100644 --- a/demo/style.css +++ b/demo/style.css @@ -9,9 +9,12 @@ h1 { } #terminal-container { - background-color: #111; - color: #fafafa; width: 960px; height: 600px; margin: 0 auto; +} + +#terminal-container .terminal { + background-color: #111; + color: #fafafa; } \ No newline at end of file diff --git a/src/xterm.css b/src/xterm.css new file mode 100644 index 00000000..41ba4904 --- /dev/null +++ b/src/xterm.css @@ -0,0 +1,43 @@ +/** + * xterm.js: xterm, in the browser + * Copyright (c) 2014, sourceLair Limited (www.sourcelair.com (MIT License) + * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License) + * https://github.com/chjj/term.js + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Originally forked from (with the author's permission): + * Fabrice Bellard's javascript vt100 for jslinux: + * http://bellard.org/jslinux/ + * Copyright (c) 2011 Fabrice Bellard + * The original design remains. The terminal itself + * has been extended to include xterm CSI codes, among + * other features. + */ + +/* +* Default style for xterm.js +*/ + +.terminal { + background-color: #000; + color: #fff; + outline: none; + font-family: courier-new, courier, monospace; +} \ No newline at end of file diff --git a/src/xterm.js b/src/xterm.js index 8ad96776..9dafc1f0 100644 --- a/src/xterm.js +++ b/src/xterm.js @@ -702,10 +702,7 @@ Terminal.prototype.open = function(parent) { // Create our main terminal element. this.element = this.document.createElement('div'); this.element.className = 'terminal'; - this.element.style.outline = 'none'; this.element.setAttribute('tabindex', 0); - this.element.style.backgroundColor = this.colors[256]; - this.element.style.color = this.colors[257]; // Create the lines for our terminal. this.children = [];