1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 17:27:58 +01:00

Merge branch 'master' into vimperator-2.1

Conflicts:
	common/content/buffer.js
	common/content/style.js
This commit is contained in:
Kris Maglione
2008-12-19 17:13:44 -05:00
7 changed files with 75 additions and 39 deletions

View File

@@ -46,8 +46,8 @@ function Buffer() //{{{
let fontSize = util.computedStyle(document.getElementById(mainWindowID)).fontSize;
styles.registerSheet("chrome://liberator/skin/liberator.css");
let error = styles.addSheet("font-size", "chrome://liberator/content/buffer.xhtml",
"body { font-size: " + fontSize + "; }", true);
let error = styles.addSheet(true, "font-size", "chrome://liberator/content/buffer.xhtml",
"body { font-size: " + fontSize + "; }");
if ("ZoomManager" in window)
{