shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow 3 arguments in rgba()

Browse Source
This commit is contained in:
ConnorSkees 2020-02-15 07:00:24 -05:00
parent 46e4ccd5f9
commit 4702461fe7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/builtin/color/rgb.rs
View File

@ -93,10 +93,10 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255), Value::Dimension(n, Unit::Percent) => (n / Number::from(100)) * Number::from(255),
_ => todo!("expected either unitless or % number for alpha"), _ => todo!("expected either unitless or % number for alpha"),
}; };
let alpha = match arg!(args, 3, "alpha").eval() { let alpha = match arg!(args, 3, "alpha"=Value::Dimension(Number::from(1), Unit::None)).eval() {
Value::Dimension(n, Unit::None) => n, Value::Dimension(n, Unit::None) => n,
Value::Dimension(n, Unit::Percent) => n / Number::from(100), Value::Dimension(n, Unit::Percent) => n / Number::from(100),
_ => todo!("expected either unitless or % number for alpha"), _ => todo!("expected either unitless or % number for alpha")
}; };
Some(Value::Color(Color::from_rgba(red, green, blue, alpha))) Some(Value::Color(Color::from_rgba(red, green, blue, alpha)))
} }

5
tests/color.rs
View File

@ -113,6 +113,11 @@ test!(
"a {\n color: rgba(1, 2, 3, 50%);\n}\n", "a {\n color: rgba(1, 2, 3, 50%);\n}\n",
"a {\n color: rgba(1, 2, 3, 0.5);\n}\n" "a {\n color: rgba(1, 2, 3, 0.5);\n}\n"
); );
test!(
rgba_3_args,
"a {\n color: rgba(7.1%, 20.4%, 33.9%);\n}\n",
"a {\n color: #123456;\n}\n"
);
test!( test!(
hsl_basic, hsl_basic,
"a {\n color: hsl(193, 67%, 99);\n}\n", "a {\n color: hsl(193, 67%, 99);\n}\n",