Improve support for transparent.

kaj · Feb 10, 2019 · 3b97ecd · 3b97ecd
1 parent 959249e
commit 3b97ecd
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 9 deletions.
diff --git a/src/value/colors.rs b/src/value/colors.rs
@@ -92,6 +92,9 @@ impl Rgba {
         }
     }
     pub fn from_name(name: &str) -> Option<Self> {
+        if name == "transparent" {
+            return Some(Self::from_rgba(0, 0, 0, 0));
+        }
         LOOKUP.n2v.get(name).map(|n| {
             // Note: nicer but not yet supported code:
             // let [_, r, g, b] = n.to_be().to_bytes()
@@ -231,7 +234,7 @@ impl Display for Rgba {
             } else {
                 write!(out, "#{:02x}{:02x}{:02x}", r, g, b)
             }
-        } else if self.all_zero() {
+        } else if out.alternate() && self.all_zero() {
             write!(out, "transparent")
         } else if out.alternate() {
             // I think the last {} should be {:#} here,

diff --git a/tests/core_functions/color/hsla/four_args/mod.rs b/tests/core_functions/color/hsla/four_args/mod.rs
@@ -8,7 +8,6 @@ use rsass::set_precision;
 
 /// From "sass-spec/spec/core_functions/color/hsla/four_args/alpha_unitless"
 #[test]
-#[ignore] // failing
 fn alpha_unitless() {
     assert_eq!(
         rsass(

diff --git a/tests/core_functions/color/rgba/four_args/mod.rs b/tests/core_functions/color/rgba/four_args/mod.rs
@@ -8,7 +8,6 @@ use rsass::set_precision;
 
 /// From "sass-spec/spec/core_functions/color/rgba/four_args/alpha_unitless"
 #[test]
-#[ignore] // failing
 fn alpha_unitless() {
     assert_eq!(
         rsass(
@@ -21,7 +20,6 @@ fn alpha_unitless() {
 
 /// From "sass-spec/spec/core_functions/color/rgba/four_args/basic"
 #[test]
-#[ignore] // failing
 fn basic() {
     assert_eq!(
         rsass(

diff --git a/tests/core_functions/color/rgba/mod.rs b/tests/core_functions/color/rgba/mod.rs
@@ -26,7 +26,6 @@ mod three_args;
 
 /// From "sass-spec/spec/core_functions/color/rgba/two_args"
 #[test]
-#[ignore] // failing
 fn two_args() {
     assert_eq!(
         rsass(

diff --git a/tests/libsass/color_functions/opacity/mod.rs b/tests/libsass/color_functions/opacity/mod.rs
@@ -30,7 +30,6 @@ fn fade_in() {
 
 /// From "sass-spec/spec/libsass/color-functions/opacity/fade-out"
 #[test]
-#[ignore] // failing
 fn fade_out() {
     assert_eq!(
         rsass(
@@ -61,7 +60,6 @@ fn opacity() {
 
 /// From "sass-spec/spec/libsass/color-functions/opacity/transparentize"
 #[test]
-#[ignore] // failing
 fn transparentize() {
     assert_eq!(
         rsass(

diff --git a/tests/libsass/color_functions/other/change_color/mod.rs b/tests/libsass/color_functions/other/change_color/mod.rs
@@ -6,7 +6,6 @@ use rsass::set_precision;
 
 /// From "sass-spec/spec/libsass/color-functions/other/change-color/a"
 #[test]
-#[ignore] // failing
 fn a() {
     assert_eq!(
         rsass(

diff --git a/tests/libsass/color_functions/rgb/rgba/mod.rs b/tests/libsass/color_functions/rgb/rgba/mod.rs
@@ -6,7 +6,6 @@ use rsass::set_precision;
 
 /// From "sass-spec/spec/libsass/color-functions/rgb/rgba/a"
 #[test]
-#[ignore] // failing
 fn a() {
     assert_eq!(
         rsass(