From d5050a3d33425cbd4103f0fcd38875be70611a9b Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Tue, 16 Sep 2008 01:09:55 +0000
Subject: [PATCH] required changes to work with newer liberators

---
 Makefile            |  2 +-
 chrome.manifest     |  2 +-
 skin/vimperator.css | 37 ++++++++++++++++++++++++++-----------
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index a40cdb53..11862e34 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 0.4
+VERSION       = 0.5pre
 NAME          = muttator
 
 include Makefile.common
diff --git a/chrome.manifest b/chrome.manifest
index 0eae6fd8..0241067a 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,6 +1,6 @@
 # Thunderbird
 content	muttator content/
-resource muttator content/
+resource muttator modules/
 locale	muttator en-US locale/en-US/
 skin muttator classic/1.0 skin/
 overlay chrome://messenger/content/messenger.xul chrome://muttator/content/muttator.xul
diff --git a/skin/vimperator.css b/skin/vimperator.css
index 301c2d1a..1dcaf2d9 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -30,11 +30,11 @@ the terms of any one of the MPL, the GPL or the LGPL.
     font-family: monospace;
 }
 
-#liberator-bufferwindow, #liberator-completion, #liberator-previewwindow {
+#liberator-completions {
     -moz-user-focus: ignore;
     overflow: -moz-scrollbars-none !important; /* does not seem to work fully */
     border-width: 0px !important;
-    -moz-appearance: none !important; /* prevent an ugly 3D border */
+    /*-moz-appearance: none !important; /* prevent an ugly 3D border */
 }
 
 /* the selected item in listboxes is hardly readable without this */
@@ -45,6 +45,10 @@ the terms of any one of the MPL, the GPL or the LGPL.
    color: HighlightText !important;
 }
 
+/*.liberator-compitem {
+    min-height: 16px;
+}*/
+
 /* fixes the min-height: 22px from firefox */
 #status-bar, statusbarpanel {
     -moz-appearance: none !important;
@@ -78,12 +82,18 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
 #liberator-commandline {
     padding: 1px;
+    font-family: monospace;
     /*
     background-color: white;
     color: black;
     */
 }
-#liberator-commandline-prompt, #liberator-commandline-command {
+#liberator-commandline-prompt {
+    margin: 0px;
+    padding: 0px;
+    background-color: inherit;
+}
+#liberator-commandline-command {
     background-color: inherit;
     color: inherit;
 }
@@ -109,6 +119,10 @@ the terms of any one of the MPL, the GPL or the LGPL.
     color: white;
     font-weight: bold;
 }
+.hl-InfoMsg {
+    background-color: white;
+    color: magenta;
+}
 .hl-ModeMsg {
     background-color: white;
     color: black;
@@ -146,7 +160,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
     color: black !important;
 }
 .hl-URL {
-    background-color: white;
+    background-color: inherit;
     color: green;
     text-decoration: none;
 }
@@ -158,29 +172,29 @@ a.hl-URL:hover {
 
 /* MOW */
 
-#liberator-multiline-output {
+#liberator-completions, #liberator-multiline-output {
     overflow: hidden;
     background-color: white;
     color: black;
 }
 
-#liberator-multiline-output-content {
-    white-space: pre; /* -moz-pre-wrap FIXME: Should lines wrap like Vim? */
+#liberator-completions-content, #liberator-multiline-output-content {
+    white-space: pre;
     font-family: -moz-fixed;
     margin: 0px;
 }
 
-#liberator-multiline-output-content * {
+#liberator-completions-content *, #liberator-multiline-output-content * {
     font: inherit;
 }
 
-#liberator-multiline-output-content table {
+#liberator-completions-content table, #liberator-multiline-output-content table {
     white-space: inherit;
     border-spacing: 0px;
 }
 
-#liberator-multiline-output-content td,
-#liberator-multiline-output-content th {
+#liberator-completions-content td, #liberator-multiline-output-content td,
+#liberator-completions-content th, #liberator-multiline-output-content th {
     padding: 0px 2px;
 }
 
@@ -189,4 +203,5 @@ a.hl-URL:hover {
     border: 0px;
 }
 
+
 /* vim: set fdm=marker sw=4 ts=4 et: */