summaryrefslogtreecommitdiff
path: root/xslt
diff options
context:
space:
mode:
authorShaun McCance <shaunm@redhat.com>2019-05-23 11:47:27 -0400
committerShaun McCance <shaunm@redhat.com>2019-05-23 11:47:27 -0400
commit4bf368da207fa1855ef08f99f0db036e71df5b09 (patch)
tree16daae125ed2514f052c06acf6ab14a7940266f3 /xslt
parent750548d706ca8a9272fd666f47015575fccf14f0 (diff)
parent0d744827fee75f48db71830508b7deb8f438f572 (diff)
downloadyelp-xsl-4bf368da207fa1855ef08f99f0db036e71df5b09.tar.gz
Merge branch 'master' into jbicha/yelp-xsl-bye-intltool
Diffstat (limited to 'xslt')
-rw-r--r--xslt/common/color.xsl14
-rw-r--r--xslt/mallard/html/mal2xhtml.xsl1
2 files changed, 8 insertions, 7 deletions
diff --git a/xslt/common/color.xsl b/xslt/common/color.xsl
index c3809e24..7bf770ad 100644
--- a/xslt/common/color.xsl
+++ b/xslt/common/color.xsl
@@ -583,7 +583,7 @@ This parameter specifies a shade of red that is suitable for borders and
other accents. It should have some contrast against background colors, but it
does not need as high of a contrast as text colors.
-->
-<xsl:param name="color.red" select="'#cc0000'"/>
+<xsl:param name="color.red" select="'#c01c28'"/>
<!--@@==========================================================================
@@ -627,7 +627,7 @@ This parameter specifies a shade of orange that is suitable for borders and
other accents. It should have some contrast against background colors, but it
does not need as high of a contrast as text colors.
-->
-<xsl:param name="color.orange" select="'#f57900'"/>
+<xsl:param name="color.orange" select="'#ffa348'"/>
<!--@@==========================================================================
@@ -671,7 +671,7 @@ This parameter specifies a shade of yellow that is suitable for borders and
other accents. It should have some contrast against background colors, but it
does not need as high of a contrast as text colors.
-->
-<xsl:param name="color.yellow" select="'#edd400'"/>
+<xsl:param name="color.yellow" select="'#f8e45c'"/>
<!--@@==========================================================================
@@ -717,7 +717,7 @@ This parameter specifies a shade of green that is suitable for borders and
other accents. It should have some contrast against background colors, but it
does not need as high of a contrast as text colors.
-->
-<xsl:param name="color.green" select="'#73d216'"/>
+<xsl:param name="color.green" select="'#57e389'"/>
<!--@@==========================================================================
@@ -761,7 +761,7 @@ This parameter specifies a shade of blue that is suitable for borders and
other accents. It should have some contrast against background colors, but it
does not need as high of a contrast as text colors.
-->
-<xsl:param name="color.blue" select="'#3465a4'"/>
+<xsl:param name="color.blue" select="'#3584e4'"/>
<!--@@==========================================================================
@@ -804,7 +804,7 @@ This parameter specifies a shade of purple that is suitable for borders and
other accents. It should have some contrast against background colors, but it
does not need as high of a contrast as text colors.
-->
-<xsl:param name="color.purple" select="'#75507b'"/>
+<xsl:param name="color.purple" select="'#a347ba'"/>
<!--@@==========================================================================
@@ -848,7 +848,7 @@ This parameter specifies a shade of gray that is suitable for borders and
other accents. It should have some contrast against background colors, but it
does not need as high of a contrast as text colors.
-->
-<xsl:param name="color.gray" select="'#babdb6'"/>
+<xsl:param name="color.gray" select="'#c0bfbc'"/>
<!--@@==========================================================================
diff --git a/xslt/mallard/html/mal2xhtml.xsl b/xslt/mallard/html/mal2xhtml.xsl
index 2f7038f3..9f54a663 100644
--- a/xslt/mallard/html/mal2xhtml.xsl
+++ b/xslt/mallard/html/mal2xhtml.xsl
@@ -57,6 +57,7 @@ http://www.w3.org/ns/ttml/feature/#timing
<xsl:param name="mal.if.target" select="'target:html target:xhtml'"/>
<xsl:param name="mal.if.features" select="concat('
mallard:1.0
+mallard:1.1
mallard:if/1.0
', $ttml.features)"/>
<xsl:param name="mal.if.maybe" select="'target:mobile'"/>