diff --git a/ChangeLog b/ChangeLog index 452787d7..a96a7596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,8 +8,8 @@ mappings go{a-z}, gn{a-z} and M{a-z} * Multiline echo support * Command line is now cleared on most redraws like in vim - * The RSS feed button in the address bar works again - * reload/stop buttons update enabled state again + * The RSS feed button in the address bar works again + * reload/stop buttons update enabled state again * added local/url marks support (thanks Viktor Kojouharov) * temporary shortcut Y to yank current selection (for non UNIX-users) * Flashing frame with ]f now works as expected diff --git a/TODO b/TODO index ecaef7fb..5690cec4 100644 --- a/TODO +++ b/TODO @@ -13,6 +13,7 @@ BUGS: dpb| 09:11:50 dpb :: and this happens only when saving the complete webpage, saving only the html works just fine.. - add window resize support to hints +- can't reverse tab through the vimperator toolbar FEATURES: 9 :map commands to keys diff --git a/chrome/content/vimperator/bookmarks.js b/chrome/content/vimperator/bookmarks.js index 6f08a56c..c01c7f99 100644 --- a/chrome/content/vimperator/bookmarks.js +++ b/chrome/content/vimperator/bookmarks.js @@ -531,10 +531,11 @@ function Marks() //{{{ // NS_ERROR_NOT_AVAILABLE" exception when used here? umarks.sort(function(a, b) { if (a[0] < b[0]) - return -1 + return -1; else if (a[0] > b[0]) return 1; - return 0 + else + return 0; }); return lmarks.concat(umarks); diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css index cc632811..ca58ddd4 100644 --- a/chrome/content/vimperator/default.css +++ b/chrome/content/vimperator/default.css @@ -88,10 +88,29 @@ fieldset.paypal { border: none; } -.command { font-weight: bold; color: #632610; } -.mapping { font-weight: bold; color: #102663; } -.option { font-weight: bold; color: #106326; } -.argument { color: #6A97D4; } +.argument { + color: #6A97D4; +} + +.command { + font-weight: bold; + color: #632610; +} + +.mapping { + font-weight: bold; + color: #102663; +} + +.option { + font-weight: bold; + color: #106326; +} + +.shorthelp { + font-weight: bold; +} + .version { position: absolute; top: 10px; @@ -99,11 +118,11 @@ fieldset.paypal { color: #C0C0C0; text-align: right; } + .warning { font-weight: bold; color: red; } -.shorthelp { font-weight: bold; } /* * XUL @@ -111,42 +130,27 @@ fieldset.paypal { * TODO: move to the standard location: chrome/skin/vimperator.css...if I can * ever convince MS ;-) -- djk */ -#vimperator-bufferwindow { +#vimperator-toolbar { font-family: monospace; - overflow:-moz-scrollbars-none; } -#vimperator-previewwindow { - font-family: monospace; - overflow:-moz-scrollbars-none; -} -#vimperator-statusline { - -moz-user-focus:ignore; -} -#vimperator-statusline-field-url { - font-family: monospace; - background-color: transparent; - -moz-user-focus:ignore; + +#vimperator-bufferwindow, #vimperator-completion, #vimperator-previewwindow { + -moz-user-focus: ignore; + overflow: -moz-scrollbars-none; } + #vimperator-statusline > label { - font-family: monospace; padding: 0px 0px 0px 8px; } -#vimperator-completion { - font-family: monospace; - -moz-user-focus:ignore; - overflow:-moz-scrollbars-none; -} + #vimperator-commandline { - -moz-user-focus:ignore; + background-color: white; + color: black; } #vimperator-commandline-prompt { - font-family: monospace; - background-color:white; - -moz-user-focus:ignore; -} -#vimperator-commandline-command { - font-family: monospace; - -moz-user-focus:ignore; + /* FIXME: black on white or default skin colours? */ + background-color: white; + color: black; } .status_insecure, .status_insecure * { diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js index fda326bb..d1711a5c 100644 --- a/chrome/content/vimperator/vimperator.js +++ b/chrome/content/vimperator/vimperator.js @@ -291,7 +291,7 @@ function Vimperator() //{{{ showMode(); } - + // always show the new mode in the statusline this.removeMode = function(main, extended) { diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul index 91b1147f..7ed11cc7 100644 --- a/chrome/content/vimperator/vimperator.xul +++ b/chrome/content/vimperator/vimperator.xul @@ -34,83 +34,82 @@ the terms of any one of the MPL, the GPL or the LGPL. + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:nc="http://home.netscape.com/NC-rdf#" + xmlns:html="http://www.w3.org/1999/xhtml" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> -