gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-26 05:05:46 +01:00
Code Issues Projects Releases Wiki Activity

Make help formatting slightly less sucky.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-29 19:58:23 -05:00
parent feb8e64fc7
commit 727950d10a
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/modules/config.jsm
View File

@@ -192,9 +192,9 @@ var ConfigBase = Class("ConfigBase", {
Enabled color: blue; Enabled color: blue;
Disabled color: red; Disabled color: red;
FontFixed font-family: monospace !important; FontFixed font-family: monospace !important;
FontCode font-family: -mox-fixed, monospace !important; FontCode font-size: 9pt; font-family: -mox-fixed, monospace !important;
FontProportional font-family: "Droid Sans", "Helvetica LT Std", Helvetica, "DejaVu Sans", Verdana, sans-serif !important; FontProportional font-size: 10pt; font-family: "Droid Sans", "Helvetica LT Std", Helvetica, "DejaVu Sans", Verdana, sans-serif !important;
// Hack to give these groups slightly higher precedence // Hack to give these groups slightly higher precedence
// than their unadorned variants. // than their unadorned variants.
@@ -329,7 +329,7 @@ var ConfigBase = Class("ConfigBase", {
helpCSS: UTF8(<><![CDATA[ helpCSS: UTF8(<><![CDATA[
// <css> // <css>
Help;;;FontProportional font-size: 8pt; line-height: 1.4em; Help;;;FontProportional line-height: 1.4em;
HelpArg;;;FontCode color: #6A97D4; HelpArg;;;FontCode color: #6A97D4;
HelpOptionalArg;;;FontCode color: #6A97D4; HelpOptionalArg;;;FontCode color: #6A97D4;
@@ -339,13 +339,13 @@ var ConfigBase = Class("ConfigBase", {
HelpCode;;;FontCode display: block; white-space: pre; margin-left: 2em; HelpCode;;;FontCode display: block; white-space: pre; margin-left: 2em;
HelpTT;;;FontFixed HelpTT;;;FontFixed
HelpDefault;;;FontCode display: inline-block; margin-right: 1ex; white-space: pre; vertical-align: text-top; HelpDefault;;;FontCode display: inline-block; margin: -1px 1ex 0 0; white-space: pre; vertical-align: text-top;
HelpDescription display: block; clear: right; HelpDescription display: block; clear: right;
HelpDescription[short] clear: none; HelpDescription[short] clear: none;
HelpEm;html|em;dactyl://help/* font-weight: bold; font-style: normal; HelpEm;html|em;dactyl://help/* font-weight: bold; font-style: normal;
HelpEx;;;FontCode display: inline-block; color: #527BBD; font-weight: bold; HelpEx;;;FontCode display: inline-block; color: #527BBD;
HelpExample display: block; margin: 1em 0; HelpExample display: block; margin: 1em 0;
HelpExample::before content: "Example: "; font-weight: bold; HelpExample::before content: "Example: "; font-weight: bold;
@@ -441,7 +441,7 @@ var ConfigBase = Class("ConfigBase", {
HelpTabDescription>*;;dactyl://help/* text-indent: 0; HelpTabDescription>*;;dactyl://help/* text-indent: 0;
HelpTabRow;html|dl>html|tr;dactyl://help/* display: table-row; HelpTabRow;html|dl>html|tr;dactyl://help/* display: table-row;
HelpTag;;;FontCode display: inline-block; color: #527BBD; margin-left: 1ex; font-size: 8pt; font-weight: bold; HelpTag;;;FontCode display: inline-block; color: #527BBD; margin-left: 1ex; font-weight: normal;
HelpTags display: block; float: right; clear: right; HelpTags display: block; float: right; clear: right;
HelpTopic;;;FontCode color: #102663; HelpTopic;;;FontCode color: #102663;
HelpType;;;FontCode margin-right: 2ex; HelpType;;;FontCode margin-right: 2ex;

5
common/modules/highlight.jsm
View File

@@ -128,6 +128,7 @@ var Highlights = Module("Highlight", {
let highlight = this.highlight[key] || this._create(false, [key]); let highlight = this.highlight[key] || this._create(false, [key]);
extend = extend || highlight.extend;
if (append) { if (append) {
newStyle = Styles.append(highlight.value || "", newStyle); newStyle = Styles.append(highlight.value || "", newStyle);
extend = highlight.extends.concat(extend); extend = highlight.extends.concat(extend);
@@ -309,8 +310,10 @@ var Highlights = Module("Highlight", {
if (!key || h.class.indexOf(key) > -1)))); if (!key || h.class.indexOf(key) > -1))));
else if (!key && clear) else if (!key && clear)
highlight.clear(); highlight.clear();
else if (key)
highlight.set(key, css, clear, "-append" in args, args["-link"]);
else else
highlight.set(key, css, clear, "-append" in args, args["-link"] || []); util.assert(false, "Invalid arguments");
}, },
{ {
// TODO: add this as a standard highlight completion function? // TODO: add this as a standard highlight completion function?

9
common/skin/dactyl.css
View File

@@ -17,6 +17,15 @@
position: absolute !important; position: absolute !important;
} }
@-moz-document
url-prefix(dactyl:) {
[dactyl|highlight~=HelpDefault] {
-moz-binding: url(chrome://dactyl/content/bindings.xml#compitem-td);
}
}
/* Applied only to completion buffer and MOW */ /* Applied only to completion buffer and MOW */
@-moz-document @-moz-document
url-prefix(chrome://dactyl/) { url-prefix(chrome://dactyl/) {