From f46d7de2119998c7990bfad704c8e3a3a1932290 Mon Sep 17 00:00:00 2001 From: HD Moore Date: Sun, 18 Feb 2007 07:23:20 +0000 Subject: [PATCH] Cleanup, converted png to gif for IEs sake git-svn-id: file:///home/svn/framework3/trunk@4431 4d416f70-5f16-0410-b530-b9f4589650da --- data/msfweb/app/views/console/index.rhtml | 3 ++- data/msfweb/public/images/banner.gif | Bin 0 -> 2812 bytes data/msfweb/public/images/banner.png | Bin 3694 -> 0 bytes data/msfweb/public/stylesheets/msfconsole.css | 22 ++++++++---------- data/msfweb/public/stylesheets/msfweb.css | 14 +++++------ data/msfweb/public/stylesheets/windows.css | 12 ++++------ 6 files changed, 23 insertions(+), 28 deletions(-) create mode 100644 data/msfweb/public/images/banner.gif delete mode 100644 data/msfweb/public/images/banner.png diff --git a/data/msfweb/app/views/console/index.rhtml b/data/msfweb/app/views/console/index.rhtml index edcd1b394c..9824ee8924 100644 --- a/data/msfweb/app/views/console/index.rhtml +++ b/data/msfweb/app/views/console/index.rhtml @@ -17,7 +17,8 @@
- <%=h @console.read %> + Welcome to the Metasploit Web Console! +

diff --git a/data/msfweb/public/images/banner.gif b/data/msfweb/public/images/banner.gif new file mode 100644 index 0000000000000000000000000000000000000000..7e3cb2ceea843fb94979e0426530defaedaf6011 GIT binary patch literal 2812 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 Ok>ChVxWYLd5CA(pe4Bj$ literal 0 HcmV?d00001 diff --git a/data/msfweb/public/images/banner.png b/data/msfweb/public/images/banner.png deleted file mode 100644 index c1d404c017a99391120ba4a925f4bdc7251ccba9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3694 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 - * All Rights Reserved. - * - * Standards compliant: - * Valid, warning-free CSS: http://jigsaw.w3.org/css-validator - */ +/* + * Copyright (c) 2006 LMH + * Added to Metasploit under the terms of the Metasploit Framework License v1.2 + * Additions Copyright (C) 2006-2007 Metasploit LLC +*/ html,body { width: 100%; height: 100%; background: #000000; color: #eeeeee; - font-family: fixed; - font-size: 12px; + font-family: monospace, console, fixed, terminal; + font-size: 11px; } #console_window { @@ -48,13 +46,13 @@ html,body { .input { font: inherit; - font-family: fixed; + font-family: fixed, console, terminal; background: #000000; border: 0; color: white; width: 600px; overflow: hidden; - font-size: 12px; + font-size: 11px; } .prompt { @@ -62,7 +60,7 @@ html,body { font: inherit; text-align: right; font-family: fixed; - font-size: 12px; + font-size: 11px; } #console_command_bar { diff --git a/data/msfweb/public/stylesheets/msfweb.css b/data/msfweb/public/stylesheets/msfweb.css index 432a93c5ef..82a63ca0b4 100644 --- a/data/msfweb/public/stylesheets/msfweb.css +++ b/data/msfweb/public/stylesheets/msfweb.css @@ -1,10 +1,8 @@ -/* - * Copyright (c) 2006, LMH - * All Rights Reserved. - * - * Standards compliant: - * Valid, warning-free CSS: http://jigsaw.w3.org/css-validator - */ +/* + * Copyright (c) 2006 LMH + * Added to Metasploit under the terms of the Metasploit Framework License v1.2 + * Additions Copyright (C) 2006-2007 Metasploit LLC +*/ html,body { padding: 0; @@ -15,7 +13,7 @@ html,body { } body { - background: #444444 url(/images/banner.png) fixed center no-repeat; + background: #444444 url(/images/banner.gif) fixed center no-repeat; color: #fff; font-family: Trebuchet, Sans, Arial, serif; } diff --git a/data/msfweb/public/stylesheets/windows.css b/data/msfweb/public/stylesheets/windows.css index 83f3d806d7..1229df00a7 100644 --- a/data/msfweb/public/stylesheets/windows.css +++ b/data/msfweb/public/stylesheets/windows.css @@ -1,10 +1,8 @@ -/* - * Copyright (c) 2006, LMH - * All Rights Reserved. - * - * Standards compliant: - * Valid, warning-free CSS: http://jigsaw.w3.org/css-validator - */ +/* + * Copyright (c) 2006 LMH + * Added to Metasploit under the terms of the Metasploit Framework License v1.2 + * Additions Copyright (C) 2006-2007 Metasploit LLC +*/ body { background: #fff;