From 0173e1e3f57dfd703055fabb0f01c9d9b4e7a109 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 29 Sep 2007 12:14:47 +0000 Subject: [PATCH] split default.css into vimperator.css and help.css --- chrome/content/vimperator/help.css | 145 +++++++++++++++++ chrome/content/vimperator/help.js | 2 +- .../{default.css => vimperator.css} | 147 +++--------------- chrome/content/vimperator/vimperator.xul | 2 +- 4 files changed, 170 insertions(+), 126 deletions(-) create mode 100644 chrome/content/vimperator/help.css rename chrome/content/vimperator/{default.css => vimperator.css} (57%) diff --git a/chrome/content/vimperator/help.css b/chrome/content/vimperator/help.css new file mode 100644 index 00000000..17ab8707 --- /dev/null +++ b/chrome/content/vimperator/help.css @@ -0,0 +1,145 @@ +/***** BEGIN LICENSE BLOCK ***** {{{ +Version: MPL 1.1/GPL 2.0/LGPL 2.1 + +The contents of this file are subject to the Mozilla Public License Version +1.1 (the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/ + +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +for the specific language governing rights and limitations under the +License. + +(c) 2006-2007: Martin Stubenschrott + +Alternatively, the contents of this file may be used under the terms of +either the GNU General Public License Version 2 or later (the "GPL"), or +the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +in which case the provisions of the GPL or the LGPL are applicable instead +of those above. If you wish to allow use of your version of this file only +under the terms of either the GPL or the LGPL, and not to allow others to +use your version of this file under the terms of the MPL, indicate your +decision by deleting the provisions above and replace them with the notice +and other provisions required by the GPL or the LGPL. If you do not delete +the provisions above, a recipient may use your version of this file under +the terms of any one of the MPL, the GPL or the LGPL. +}}} ***** END LICENSE BLOCK *****/ + +div.main { + font-family: -moz-fixed; + white-space: -moz-pre-wrap; + width: 800px; + margin-left: auto; + margin-right: auto; +} + +h1 { + text-align: center; +} + +p.tagline { + text-align: center; + font-weight: bold; +} + +table.vimperator { + border-width: 1px; + border-style: dotted; + border-color: gray; + /*margin-bottom: 2em; /* FIXME: just a quick hack until we have proper pages */ +} +table.vimperator td { + border: none; + padding: 3px; +} +tr.separator { + height: 10px; +} +hr { + height: 1px; + background-color: white; + border-style: none; + margin-top: 0; + margin-bottom: 0; +} +td.taglist { + text-align: right; + vertical-align: top; + border-spacing: 13px 10px; +} +td.taglist td { + width: 100px; + padding: 3px 0px; +} +tr.taglist code, td.usage code { + margin: 0px 2px; +} +td.usage code { + white-space: nowrap; +} +td.taglist code { + margin-left: 2em; +} +code.tag { + font-weight: bold; + color: rgb(255, 0, 255); /* magenta */ +} +tr.description { + margin-bottom: 4px; +} +table.commands { + background-color: rgb(250, 240, 230); +} +table.mappings { + background-color: rgb(230, 240, 250); +} +table.options { + background-color: rgb(240, 250, 230); +} + +fieldset.paypal { + border: none; +} + +.argument { + color: #6A97D4; +} + +.command { + font-weight: bold; + color: #632610; +} + +.mapping { + font-weight: bold; + color: #102663; +} + +.option { + font-weight: bold; + color: #106326; +} + +.code { + color: #108826; +} + +.shorthelp { + font-weight: bold; +} + +.version { + position: absolute; + top: 10px; + right: 2%; + color: #C0C0C0; + text-align: right; +} + +.warning { + font-weight: bold; + color: red; +} + +/* vim: set fdm=marker sw=4 ts=4 et: */ diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js index 4ee38e98..6da9766e 100644 --- a/chrome/content/vimperator/help.js +++ b/chrome/content/vimperator/help.js @@ -208,7 +208,7 @@ vimperator.help = function(section, easter) //{{{ '\n' + '\n\nVimperator help\n' + // XXX: stylesheet broken here? Have to add it in the vimperator.xul file - '\n' + + '\n' + '\n\n
\n' + 'version ' + vimperator.version + '\n' + header + diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/vimperator.css similarity index 57% rename from chrome/content/vimperator/default.css rename to chrome/content/vimperator/vimperator.css index beb1e78a..4e88216d 100644 --- a/chrome/content/vimperator/default.css +++ b/chrome/content/vimperator/vimperator.css @@ -1,128 +1,31 @@ -/* - * Help file {{{ - */ +/***** BEGIN LICENSE BLOCK ***** {{{ +Version: MPL 1.1/GPL 2.0/LGPL 2.1 -div.main { - font-family: -moz-fixed; - white-space: -moz-pre-wrap; - width: 800px; - margin-left: auto; - margin-right: auto; -} +The contents of this file are subject to the Mozilla Public License Version +1.1 (the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/ -h1 { - text-align: center; -} +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +for the specific language governing rights and limitations under the +License. -p.tagline { - text-align: center; - font-weight: bold; -} +(c) 2006-2007: Martin Stubenschrott -table.vimperator { - border-width: 1px; - border-style: dotted; - border-color: gray; - /*margin-bottom: 2em; /* FIXME: just a quick hack until we have proper pages */ -} -table.vimperator td { - border: none; - padding: 3px; -} -tr.separator { - height: 10px; -} -hr { - height: 1px; - background-color: white; - border-style: none; - margin-top: 0; - margin-bottom: 0; -} -td.taglist { - text-align: right; - vertical-align: top; - border-spacing: 13px 10px; -} -td.taglist td { - width: 100px; - padding: 3px 0px; -} -tr.taglist code, td.usage code { - margin: 0px 2px; -} -td.usage code { - white-space: nowrap; -} -td.taglist code { - margin-left: 2em; -} -code.tag { - font-weight: bold; - color: rgb(255, 0, 255); /* magenta */ -} -tr.description { - margin-bottom: 4px; -} -table.commands { - background-color: rgb(250, 240, 230); -} -table.mappings { - background-color: rgb(230, 240, 250); -} -table.options { - background-color: rgb(240, 250, 230); -} +Alternatively, the contents of this file may be used under the terms of +either the GNU General Public License Version 2 or later (the "GPL"), or +the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +in which case the provisions of the GPL or the LGPL are applicable instead +of those above. If you wish to allow use of your version of this file only +under the terms of either the GPL or the LGPL, and not to allow others to +use your version of this file under the terms of the MPL, indicate your +decision by deleting the provisions above and replace them with the notice +and other provisions required by the GPL or the LGPL. If you do not delete +the provisions above, a recipient may use your version of this file under +the terms of any one of the MPL, the GPL or the LGPL. +}}} ***** END LICENSE BLOCK *****/ -fieldset.paypal { - border: none; -} - -.argument { - color: #6A97D4; -} - -.command { - font-weight: bold; - color: #632610; -} - -.mapping { - font-weight: bold; - color: #102663; -} - -.option { - font-weight: bold; - color: #106326; -} - -.code { - color: #108826; -} - -.shorthelp { - font-weight: bold; -} - -.version { - position: absolute; - top: 10px; - right: 2%; - color: #C0C0C0; - text-align: right; -} - -.warning { - font-weight: bold; - color: red; -} - -/* }}} - * XUL {{{ - * TODO: move to the standard location: chrome/skin/vimperator.css...if I can - * ever convince MS :( -- djk - */ #vimperator-container { font-family: monospace; } @@ -220,8 +123,4 @@ fieldset.paypal { background-color: black; } -/* - * }}} - */ - /* vim: set fdm=marker sw=4 ts=4 et: */ diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul index cb52c380..55e41e2d 100644 --- a/chrome/content/vimperator/vimperator.xul +++ b/chrome/content/vimperator/vimperator.xul @@ -31,7 +31,7 @@ the terms of any one of the MPL, the GPL or the LGPL. - +