summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--src/yelp-gecko-utils.cpp10
-rw-r--r--src/yelp-html-gecko.c10
-rw-r--r--src/yelp-settings.c103
-rw-r--r--src/yelp-settings.h31
-rw-r--r--stylesheets/db2html.xsl.in73
-rw-r--r--stylesheets/info2html.xsl29
-rw-r--r--stylesheets/man2html.xsl29
-rw-r--r--stylesheets/toc2html.xsl36
9 files changed, 193 insertions, 140 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c94106d..606b3830 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-11 Shaun McCance <shaunm@gnome.org>
+
+ * src/yelp-gecko-utils.cpp:
+ * src/yelp-html-gecko.c:
+ * src/yelp-settings.c:
+ * src/yelp-settings.h:
+ * stylesheets/db2html.xsl.in:
+ * stylesheets/info2html.xsl:
+ * stylesheets/man2html.xsl:
+ * stylesheets/toc2html.xsl:
+ - Changed color parameters around
+
2005-05-09 Shaun McCance <shaunm@gnome.org>
* data/yelp.js:
diff --git a/src/yelp-gecko-utils.cpp b/src/yelp-gecko-utils.cpp
index 1ddb410f..cd410028 100644
--- a/src/yelp-gecko-utils.cpp
+++ b/src/yelp-gecko-utils.cpp
@@ -123,16 +123,16 @@ yelp_gecko_set_color (YelpColorType type, const gchar *color)
{
gecko_prefs_set_bool ("browser.display.use_system_colors", FALSE);
switch (type) {
- case YELP_COLOR_TEXT:
+ case YELP_COLOR_FG:
gecko_prefs_set_string ("browser.display.foreground_color",
color);
break;
- case YELP_COLOR_ANCHOR:
- gecko_prefs_set_string ("browser.anchor_color",
+ case YELP_COLOR_BG:
+ gecko_prefs_set_string ("browser.display.background_color",
color);
break;
- case YELP_COLOR_BACKGROUND:
- gecko_prefs_set_string ("browser.display.background_color",
+ case YELP_COLOR_ANCHOR:
+ gecko_prefs_set_string ("browser.anchor_color",
color);
break;
}
diff --git a/src/yelp-html-gecko.c b/src/yelp-html-gecko.c
index a24f79ac..f11233de 100644
--- a/src/yelp-html-gecko.c
+++ b/src/yelp-html-gecko.c
@@ -338,14 +338,14 @@ html_set_colors (void)
{
gchar *color;
- color = (gchar *) yelp_settings_get_color (YELP_COLOR_TEXT);
- yelp_gecko_set_color (YELP_COLOR_TEXT, color);
+ color = (gchar *) yelp_settings_get_color (YELP_COLOR_FG);
+ yelp_gecko_set_color (YELP_COLOR_FG, color);
+
+ color = (gchar *) yelp_settings_get_color (YELP_COLOR_BG);
+ yelp_gecko_set_color (YELP_COLOR_BG, color);
color = (gchar *) yelp_settings_get_color (YELP_COLOR_ANCHOR);
yelp_gecko_set_color (YELP_COLOR_ANCHOR, color);
-
- color = (gchar *) yelp_settings_get_color (YELP_COLOR_BACKGROUND);
- yelp_gecko_set_color (YELP_COLOR_BACKGROUND, color);
}
static void
diff --git a/src/yelp-settings.c b/src/yelp-settings.c
index ea70011e..02235f0a 100644
--- a/src/yelp-settings.c
+++ b/src/yelp-settings.c
@@ -51,29 +51,32 @@
#endif
static const gchar * const color_params[YELP_NUM_COLORS] = {
- "yelp.color.text",
+ "yelp.color.fg",
+ "yelp.color.bg",
"yelp.color.anchor",
- "yelp.color.background",
"yelp.color.rule",
- "yelp.color.base0",
- "yelp.color.base1",
- "yelp.color.base2",
- "yelp.color.base3",
- "yelp.color.selected0",
- "yelp.color.selected1",
- "yelp.color.selected2",
- "yelp.color.selected3",
- "yelp.color.yellow.bg",
- "yelp.color.yellow.fg"
+ "yelp.color.gray.fg",
+ "yelp.color.gray.bg",
+ "yelp.color.gray.bg.dark1",
+ "yelp.color.gray.bg.dark2",
+ "yelp.color.gray.bg.dark3",
+ "yelp.color.selected.fg",
+ "yelp.color.selected.bg",
+ "yelp.color.selected.bg.dark1",
+ "yelp.color.selected.bg.dark2",
+ "yelp.color.selected.bg.dark3",
+ "yelp.color.admon.fg",
+ "yelp.color.admon.bg",
+ "yelp.color.admon.bg.dark1",
+ "yelp.color.admon.bg.dark2",
+ "yelp.color.admon.bg.dark3"
};
static const gchar * const icon_params[YELP_NUM_ICONS] = {
"yelp.icon.blockquote",
"yelp.icon.caution",
"yelp.icon.important",
- "yelp.icon.next",
"yelp.icon.note",
- "yelp.icon.previous",
"yelp.icon.programlisting",
"yelp.icon.tip",
"yelp.icon.warning"
@@ -158,15 +161,9 @@ yelp_settings_init (void)
case YELP_ICON_IMPORTANT:
icon_names[i] = "yelp-icon-important";
break;
- case YELP_ICON_NEXT:
- icon_names[i] = "stock_next-page";
- break;
case YELP_ICON_NOTE:
icon_names[i] = "yelp-icon-note";
break;
- case YELP_ICON_PREVIOUS:
- icon_names[i] = "stock_previous-page";
- break;
case YELP_ICON_PROGRAMLISTING:
icon_names[i] = "yelp-watermark-programlisting";
break;
@@ -580,17 +577,34 @@ settings_update (YelpSettingsType type)
MAX(style->base[GTK_STATE_NORMAL].green,
style->base[GTK_STATE_NORMAL].blue )) >> 8;
- g_snprintf (colors[YELP_COLOR_TEXT], 8,
+ /* YELP_COLOR_FG */
+ g_snprintf (colors[YELP_COLOR_FG], 8,
"#%02X%02X%02X",
style->text[GTK_STATE_NORMAL].red >> 8,
style->text[GTK_STATE_NORMAL].green >> 8,
style->text[GTK_STATE_NORMAL].blue >> 8);
- g_snprintf (colors[YELP_COLOR_BACKGROUND], 8,
+ /* YELP_COLOR_BG */
+ g_snprintf (colors[YELP_COLOR_BG], 8,
"#%02X%02X%02X",
style->base[GTK_STATE_NORMAL].red >> 8,
style->base[GTK_STATE_NORMAL].green >> 8,
style->base[GTK_STATE_NORMAL].blue >> 8);
+ /* YELP_COLOR_ANCHOR */
+ widget = gnome_href_new ("http://www.gnome.org/", "GNOME");
+ gtk_widget_style_get (widget, "link_color", &color, NULL);
+ if (!color)
+ color = &blue;
+ g_snprintf (colors[YELP_COLOR_ANCHOR], 8,
+ "#%02X%02X%02X",
+ color->red >> 8,
+ color->green >> 8,
+ color->blue >> 8);
+ if (color != &blue)
+ gdk_color_free (color);
+ gtk_object_sink (GTK_OBJECT (widget));
+
+ /* YELP_COLOR_RULE */
g_snprintf (colors[YELP_COLOR_RULE], 8,
"#%02X%02X%02X",
((style->base[GTK_STATE_NORMAL].red >> 8) +
@@ -600,6 +614,7 @@ settings_update (YelpSettingsType type)
((style->base[GTK_STATE_NORMAL].blue >> 8) +
(style->bg[GTK_STATE_NORMAL].blue >> 8) ) / 2);
+ /* YELP_COLOR_GRAY_BG */
for (i = 0; i < 4; i++) {
rval = ((4 - i) * (style->bg[GTK_STATE_NORMAL].red >> 8) +
i * max_text) / 4;
@@ -607,9 +622,22 @@ settings_update (YelpSettingsType type)
i * max_text) / 4;
bval = ((4 - i) * (style->bg[GTK_STATE_NORMAL].blue >> 8) +
i * max_text) / 4;
- g_snprintf (colors[YELP_COLOR_BASE0 + i], 8,
+ g_snprintf (colors[YELP_COLOR_GRAY_BG + i], 8,
"#%02X%02X%02X", rval, gval, bval);
}
+
+ /* YELP_COLOR_GRAY_FG */
+ g_snprintf (colors[YELP_COLOR_GRAY_FG], 8, "%s",
+ colors[YELP_COLOR_GRAY_BG_DARK3]);
+
+ /* YELP_COLOR_SELECTED_FG */
+ g_snprintf (colors[YELP_COLOR_SELECTED_FG], 8,
+ "#%02X%02X%02X",
+ style->text[GTK_STATE_SELECTED].red >> 8,
+ style->text[GTK_STATE_SELECTED].green >> 8,
+ style->text[GTK_STATE_SELECTED].blue >> 8);
+
+ /* YELP_COLOR_SELECTED_BG */
for (i = 0; i < 4; i++) {
rval = ((4 - i) * (style->bg[GTK_STATE_SELECTED].red >> 8) +
i * max_text) / 4;
@@ -617,35 +645,26 @@ settings_update (YelpSettingsType type)
i * max_text) / 4;
bval = ((4 - i) * (style->bg[GTK_STATE_SELECTED].blue >> 8) +
i * max_text) / 4;
- g_snprintf (colors[YELP_COLOR_SELECTED0 + i], 8,
+ g_snprintf (colors[YELP_COLOR_SELECTED_BG + i], 8,
"#%02X%02X%02X", rval, gval, bval);
}
- for (i = 0; i < 2; i++) {
- gint mult = (i == 0) ? max_base : max_text;
+ /* YELP_COLOR_ADMON_FG */
+ g_snprintf (colors[YELP_COLOR_ADMON_FG], 8, "%s",
+ colors[YELP_COLOR_GRAY_BG_DARK3]);
+ /* YELP_COLOR_ADMON_BG */
+ for (i = 0; i < 4; i++) {
+ gint mult = max_base + ((i * (max_base - max_text)) / 3);
rval = ((255 * mult) / 255);
- gval = ((255 * mult) / 255);
- bval = ((220 * mult) / 255);
+ gval = ((245 * mult) / 255);
+ bval = ((207 * mult) / 255);
- g_snprintf (colors[YELP_COLOR_YELLOW_BG + i], 8,
+ g_snprintf (colors[YELP_COLOR_ADMON_BG + i], 8,
"#%02X%02X%02X", rval, gval, bval);
}
g_object_unref (G_OBJECT (style));
-
- widget = gnome_href_new ("http://www.gnome.org/", "GNOME");
- gtk_widget_style_get (widget, "link_color", &color, NULL);
- if (!color)
- color = &blue;
- g_snprintf (colors[YELP_COLOR_ANCHOR], 8,
- "#%02X%02X%02X",
- color->red >> 8,
- color->green >> 8,
- color->blue >> 8);
- if (color != &blue)
- gdk_color_free (color);
- gtk_object_sink (GTK_OBJECT (widget));
}
for (i = 0; i < YELP_SETTINGS_NUM_TYPES; i++)
diff --git a/src/yelp-settings.h b/src/yelp-settings.h
index ead8a5a7..61862ce5 100644
--- a/src/yelp-settings.h
+++ b/src/yelp-settings.h
@@ -49,20 +49,25 @@ typedef enum {
} YelpFontType;
typedef enum {
- YELP_COLOR_TEXT = 0,
+ YELP_COLOR_FG = 0,
+ YELP_COLOR_BG,
YELP_COLOR_ANCHOR,
- YELP_COLOR_BACKGROUND,
YELP_COLOR_RULE,
- YELP_COLOR_BASE0,
- YELP_COLOR_BASE1,
- YELP_COLOR_BASE2,
- YELP_COLOR_BASE3,
- YELP_COLOR_SELECTED0,
- YELP_COLOR_SELECTED1,
- YELP_COLOR_SELECTED2,
- YELP_COLOR_SELECTED3,
- YELP_COLOR_YELLOW_BG,
- YELP_COLOR_YELLOW_FG,
+ YELP_COLOR_GRAY_FG,
+ YELP_COLOR_GRAY_BG,
+ YELP_COLOR_GRAY_BG_DARK1,
+ YELP_COLOR_GRAY_BG_DARK2,
+ YELP_COLOR_GRAY_BG_DARK3,
+ YELP_COLOR_SELECTED_FG,
+ YELP_COLOR_SELECTED_BG,
+ YELP_COLOR_SELECTED_BG_DARK1,
+ YELP_COLOR_SELECTED_BG_DARK2,
+ YELP_COLOR_SELECTED_BG_DARK3,
+ YELP_COLOR_ADMON_FG,
+ YELP_COLOR_ADMON_BG,
+ YELP_COLOR_ADMON_BG_DARK1,
+ YELP_COLOR_ADMON_BG_DARK2,
+ YELP_COLOR_ADMON_BG_DARK3,
YELP_NUM_COLORS
} YelpColorType;
@@ -70,9 +75,7 @@ typedef enum {
YELP_ICON_BLOCKQUOTE = 0,
YELP_ICON_CAUTION,
YELP_ICON_IMPORTANT,
- YELP_ICON_NEXT,
YELP_ICON_NOTE,
- YELP_ICON_PREVIOUS,
YELP_ICON_PROGRAMLISTING,
YELP_ICON_TIP,
YELP_ICON_WARNING,
diff --git a/stylesheets/db2html.xsl.in b/stylesheets/db2html.xsl.in
index 51e2aaf2..ded40764 100644
--- a/stylesheets/db2html.xsl.in
+++ b/stylesheets/db2html.xsl.in
@@ -12,40 +12,39 @@
<xsl:param name="yelp.icon.blockquote"/>
<xsl:param name="yelp.icon.caution"/>
<xsl:param name="yelp.icon.important"/>
-<xsl:param name="yelp.icon.next"/>
<xsl:param name="yelp.icon.note"/>
-<xsl:param name="yelp.icon.previous"/>
<xsl:param name="yelp.icon.programlisting"/>
<xsl:param name="yelp.icon.tip"/>
<xsl:param name="yelp.icon.warning"/>
-<xsl:param name="yelp.color.text"/>
+<xsl:param name="yelp.color.fg"/>
+<xsl:param name="yelp.color.bg"/>
<xsl:param name="yelp.color.anchor"/>
-<xsl:param name="yelp.color.background"/>
<xsl:param name="yelp.color.rule"/>
-<xsl:param name="yelp.color.base0"/>
-<xsl:param name="yelp.color.base1"/>
-<xsl:param name="yelp.color.base2"/>
-<xsl:param name="yelp.color.base3"/>
-<xsl:param name="yelp.color.selected0"/>
-<xsl:param name="yelp.color.selected1"/>
-<xsl:param name="yelp.color.selected2"/>
-<xsl:param name="yelp.color.selected3"/>
-
-<xsl:param name="yelp.color.yellow.bg"/>
-<xsl:param name="yelp.color.yellow.fg"/>
-
-<xsl:param name="db2html.admon.border_color"
- select="$yelp.color.selected0"/>
+<xsl:param name="yelp.color.gray.fg"/>
+<xsl:param name="yelp.color.gray.bg"/>
+<xsl:param name="yelp.color.gray.bg.dark1"/>
+<xsl:param name="yelp.color.gray.bg.dark2"/>
+<xsl:param name="yelp.color.gray.bg.dark3"/>
+<xsl:param name="yelp.color.selected.fg"/>
+<xsl:param name="yelp.color.selected.bg"/>
+<xsl:param name="yelp.color.selected.bg.dark1"/>
+<xsl:param name="yelp.color.selected.bg.dark2"/>
+<xsl:param name="yelp.color.selected.bg.dark3"/>
+<xsl:param name="yelp.color.admon.fg"/>
+<xsl:param name="yelp.color.admon.bg"/>
+<xsl:param name="yelp.color.admon.bg.dark1"/>
+<xsl:param name="yelp.color.admon.bg.dark2"/>
+<xsl:param name="yelp.color.admon.bg.dark3"/>
<xsl:param name="db2html.programlisting.background_color"
- select="$yelp.color.base0"/>
+ select="$yelp.color.gray.bg"/>
<xsl:param name="db2html.programlisting.border_color"
- select="$yelp.color.base1"/>
+ select="$yelp.color.gray.bg.dark1"/>
<xsl:param name="db2html.screen.background_color"
- select="$yelp.color.base0"/>
+ select="$yelp.color.gray.bg"/>
<xsl:param name="db2html.screen.border_color"
- select="$yelp.color.base1"/>
+ select="$yelp.color.gray.bg.dark1"/>
<xsl:param name="db2html.table.rule_color"
select="$yelp.color.rule"/>
@@ -116,7 +115,7 @@
h2 { font-size: 1.2em; }
h1 + div h2[class~="title"] { margin-top: 2em; }
h1, h2, h3, h4, h5, h6, h7 { color: </xsl:text>
- <xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
+ <xsl:value-of select="$yelp.color.gray.fg"/><xsl:text>; }
h3 span[class~="title"] { border-bottom: none; }
h4 span[class~="title"] { border-bottom: none; }
h5 span[class~="title"] { border-bottom: none; }
@@ -125,13 +124,13 @@
div[class~="admonition"] {
color: </xsl:text>
- <xsl:value-of select="$yelp.color.base3"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.admon.fg"/><xsl:text>;
border-color: </xsl:text>
- <xsl:value-of select="$yelp.color.yellow.fg"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.admon.bg.dark1"/><xsl:text>;
-moz-border-radius-topleft: 12px;
-moz-border-radius-bottomleft: 12px;
background-color: </xsl:text>
- <xsl:value-of select="$yelp.color.yellow.bg"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.admon.bg"/><xsl:text>;
}
div[class~="programlisting"] {
background-image: url(</xsl:text>
@@ -164,24 +163,22 @@
<xsl:value-of select="$yelp.icon.warning"/><xsl:text>");
}
- <!--
/* Gecko seems to get selection color wrong on some themes */
/* Add this when you can replace .background with the actual
selection foreground color */
::-moz-selection {
background-color: </xsl:text>
- <xsl:value-of select="$yelp.color.selected0"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.selected.bg"/><xsl:text>;
color: </xsl:text>
- <xsl:value-of select="$yelp.color.background"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.selected.fg"/><xsl:text>;
}
- -->
html { min-height: 100%; }
body {
-moz-box-sizing: border-box;
min-height: 100%;
border: solid 1px </xsl:text>
- <xsl:value-of select="$yelp.color.base1"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.gray.bg.dark1"/><xsl:text>;
}
div[class~="linktrail"] {
font-size: 0.8em;
@@ -191,15 +188,15 @@
padding-left: 12px;
padding-right: 12px;
background-color: </xsl:text>
- <xsl:value-of select="$yelp.color.base0"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.gray.bg"/><xsl:text>;
border: none;
border-bottom: solid 1px </xsl:text>
- <xsl:value-of select="$yelp.color.base1"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.gray.bg.dark1"/><xsl:text>;
}
span[class~="linktrail"]:after {
content: '&#x2003;/&#x2003;';
color: </xsl:text>
- <xsl:value-of select="$yelp.color.base2"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.gray.fg"/><xsl:text>;
}
a[class~="linktrail"] { text-decoration: none; }
a[class~="linktrail"]:hover { text-decoration: underline; }
@@ -210,10 +207,10 @@
padding-left: 12px;
padding-right: 12px;
background-color: </xsl:text>
- <xsl:value-of select="$yelp.color.base0"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.gray.bg"/><xsl:text>;
border: none;
border-top: solid 1px </xsl:text>
- <xsl:value-of select="$yelp.color.base1"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.gray.bg.dark1"/><xsl:text>;
}
div[class~="navbar"] span { white-space: nowrap; }
div[class~="navbar"] a { text-decoration: none; }
@@ -221,13 +218,13 @@
span[class~="navbar-prev"]:before {
content: '◀&#x2003;';
color: </xsl:text>
- <xsl:value-of select="$yelp.color.base2"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.gray.fg"/><xsl:text>;
text-decoration: none;
}
span[class~="navbar-next"]:after {
content: '&#x2003;▶';
color: </xsl:text>
- <xsl:value-of select="$yelp.color.base2"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.gray.fg"/><xsl:text>;
text-decoration: none;
}
</xsl:text>
diff --git a/stylesheets/info2html.xsl b/stylesheets/info2html.xsl
index f5b1f3f4..3d2320e7 100644
--- a/stylesheets/info2html.xsl
+++ b/stylesheets/info2html.xsl
@@ -16,18 +16,25 @@
<xsl:param name="yelp.icon.tip"/>
<xsl:param name="yelp.icon.warning"/>
-<xsl:param name="yelp.color.text"/>
+<xsl:param name="yelp.color.fg"/>
+<xsl:param name="yelp.color.bg"/>
<xsl:param name="yelp.color.anchor"/>
-<xsl:param name="yelp.color.background"/>
<xsl:param name="yelp.color.rule"/>
-<xsl:param name="yelp.color.base0"/>
-<xsl:param name="yelp.color.base1"/>
-<xsl:param name="yelp.color.base2"/>
-<xsl:param name="yelp.color.base3"/>
-<xsl:param name="yelp.color.selected0"/>
-<xsl:param name="yelp.color.selected1"/>
-<xsl:param name="yelp.color.selected2"/>
-<xsl:param name="yelp.color.selected3"/>
+<xsl:param name="yelp.color.gray.fg"/>
+<xsl:param name="yelp.color.gray.bg"/>
+<xsl:param name="yelp.color.gray.bg.dark1"/>
+<xsl:param name="yelp.color.gray.bg.dark2"/>
+<xsl:param name="yelp.color.gray.bg.dark3"/>
+<xsl:param name="yelp.color.selected.fg"/>
+<xsl:param name="yelp.color.selected.bg"/>
+<xsl:param name="yelp.color.selected.bg.dark1"/>
+<xsl:param name="yelp.color.selected.bg.dark2"/>
+<xsl:param name="yelp.color.selected.bg.dark3"/>
+<xsl:param name="yelp.color.admon.fg"/>
+<xsl:param name="yelp.color.admon.bg"/>
+<xsl:param name="yelp.color.admon.bg.dark1"/>
+<xsl:param name="yelp.color.admon.bg.dark2"/>
+<xsl:param name="yelp.color.admon.bg.dark3"/>
<xsl:template match="/Info">
<xsl:apply-templates select="Section"/>
@@ -69,7 +76,7 @@ h2 { font-size: 1.4em; font-weight: bold; }
h3 { font-size: 1.2em; font-weight: bold; }
h1, h2, h3, h4, h5, h6, h7 { color: </xsl:text>
-<xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
+<xsl:value-of select="$yelp.color.gray.fg"/><xsl:text>; }
body { margin: 0em; padding: 0em; }
pre[class~="body"] {
diff --git a/stylesheets/man2html.xsl b/stylesheets/man2html.xsl
index 3ab5cdc5..357d9c44 100644
--- a/stylesheets/man2html.xsl
+++ b/stylesheets/man2html.xsl
@@ -16,18 +16,25 @@
<xsl:param name="yelp.icon.tip"/>
<xsl:param name="yelp.icon.warning"/>
-<xsl:param name="yelp.color.text"/>
+<xsl:param name="yelp.color.fg"/>
+<xsl:param name="yelp.color.bg"/>
<xsl:param name="yelp.color.anchor"/>
-<xsl:param name="yelp.color.background"/>
<xsl:param name="yelp.color.rule"/>
-<xsl:param name="yelp.color.base0"/>
-<xsl:param name="yelp.color.base1"/>
-<xsl:param name="yelp.color.base2"/>
-<xsl:param name="yelp.color.base3"/>
-<xsl:param name="yelp.color.selected0"/>
-<xsl:param name="yelp.color.selected1"/>
-<xsl:param name="yelp.color.selected2"/>
-<xsl:param name="yelp.color.selected3"/>
+<xsl:param name="yelp.color.gray.fg"/>
+<xsl:param name="yelp.color.gray.bg"/>
+<xsl:param name="yelp.color.gray.bg.dark1"/>
+<xsl:param name="yelp.color.gray.bg.dark2"/>
+<xsl:param name="yelp.color.gray.bg.dark3"/>
+<xsl:param name="yelp.color.selected.fg"/>
+<xsl:param name="yelp.color.selected.bg"/>
+<xsl:param name="yelp.color.selected.bg.dark1"/>
+<xsl:param name="yelp.color.selected.bg.dark2"/>
+<xsl:param name="yelp.color.selected.bg.dark3"/>
+<xsl:param name="yelp.color.admon.fg"/>
+<xsl:param name="yelp.color.admon.bg"/>
+<xsl:param name="yelp.color.admon.bg.dark1"/>
+<xsl:param name="yelp.color.admon.bg.dark2"/>
+<xsl:param name="yelp.color.admon.bg.dark3"/>
<xsl:template match="Man">
<xsl:choose>
@@ -67,7 +74,7 @@ h2 { font-size: 1.4em; font-weight: bold; }
h3 { font-size: 1.2em; font-weight: bold; }
h1, h2, h3, h4, h5, h6, h7 { color: </xsl:text>
-<xsl:value-of select="$yelp.color.selected1"/><xsl:text>; }
+<xsl:value-of select="$yelp.color.gray.fg"/><xsl:text>; }
div[class~="SH"] { margin-left: 1.2em; }
div[class~="SS"] { margin-left: 1.6em; }
diff --git a/stylesheets/toc2html.xsl b/stylesheets/toc2html.xsl
index c3cc59ac..2bf5bd6d 100644
--- a/stylesheets/toc2html.xsl
+++ b/stylesheets/toc2html.xsl
@@ -8,17 +8,25 @@
<xsl:param name="help_icon"/>
<xsl:param name="help_icon_size"/>
-<xsl:param name="yelp.color.text"/>
+<xsl:param name="yelp.color.fg"/>
+<xsl:param name="yelp.color.bg"/>
<xsl:param name="yelp.color.anchor"/>
-<xsl:param name="yelp.color.background"/>
-<xsl:param name="yelp.color.base0"/>
-<xsl:param name="yelp.color.base1"/>
-<xsl:param name="yelp.color.base2"/>
-<xsl:param name="yelp.color.base3"/>
-<xsl:param name="yelp.color.selected0"/>
-<xsl:param name="yelp.color.selected1"/>
-<xsl:param name="yelp.color.selected2"/>
-<xsl:param name="yelp.color.selected3"/>
+<xsl:param name="yelp.color.rule"/>
+<xsl:param name="yelp.color.gray.fg"/>
+<xsl:param name="yelp.color.gray.bg"/>
+<xsl:param name="yelp.color.gray.bg.dark1"/>
+<xsl:param name="yelp.color.gray.bg.dark2"/>
+<xsl:param name="yelp.color.gray.bg.dark3"/>
+<xsl:param name="yelp.color.selected.fg"/>
+<xsl:param name="yelp.color.selected.bg"/>
+<xsl:param name="yelp.color.selected.bg.dark1"/>
+<xsl:param name="yelp.color.selected.bg.dark2"/>
+<xsl:param name="yelp.color.selected.bg.dark3"/>
+<xsl:param name="yelp.color.admon.fg"/>
+<xsl:param name="yelp.color.admon.bg"/>
+<xsl:param name="yelp.color.admon.bg.dark1"/>
+<xsl:param name="yelp.color.admon.bg.dark2"/>
+<xsl:param name="yelp.color.admon.bg.dark3"/>
<xsl:template match="toc">
<yelp:document href="{@id}">
@@ -43,11 +51,11 @@
padding-bottom: 0.2em;
-moz-border-radius: 6px;
border: solid 1px </xsl:text>
- <xsl:value-of select="$yelp.color.selected1"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.selected.bg.dark1"/><xsl:text>;
background-color: </xsl:text>
- <xsl:value-of select="$yelp.color.selected0"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.selected.bg"/><xsl:text>;
color: </xsl:text>
- <xsl:value-of select="$yelp.color.background"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.selected.fg"/><xsl:text>;
}
h1 img {
position: absolute;
@@ -79,7 +87,7 @@
}
div[class~="tocs"] + div[class~="docs"] {
border-top: solid 1px </xsl:text>
- <xsl:value-of select="$yelp.color.selected0"/><xsl:text>;
+ <xsl:value-of select="$yelp.color.selected.bg"/><xsl:text>;
}
ul { margin-left: 0em; padding-left: 0em; }
li {
View Lorry Controller Status