Commit 6fdf6ba6 authored by Benjamin Otte's avatar Benjamin Otte

css: Remove generic 'none' handling

Includes updated tests.
Who could have thought that our tests were broken. Ooops.
parent 7d353fbc
......@@ -2366,14 +2366,6 @@ _gtk_style_property_parse_value (const GtkStyleProperty *property,
g_value_set_enum (value, GTK_CSS_INHERIT);
return TRUE;
}
else if (_gtk_css_parser_try (parser, "none", TRUE))
{
/* Insert the default value, so it has an opportunity
* to override other style providers when merged
*/
g_param_value_set_default (property->pspec, value);
return TRUE;
}
else if (property->property_parse_func)
{
GError *error = NULL;
......
......@@ -31,34 +31,30 @@ h {
}
i {
border-radius: none;
}
j {
border-radius: 1.125 / 5.5;
}
k {
j {
border-radius: 1 2.25 / 5;
}
l {
k {
border-radius: 1 2 3.5 / 5.5 6.75;
}
m {
l {
border-radius: 0 / 0;
}
n {
m {
border-radius: 0;
}
o {
n {
border-radius: 0 / 1;
}
p {
o {
border-radius: 1 / 0;
}
......
border-radius.css:64: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:68: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:72: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:76: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
......@@ -10,4 +11,3 @@ border-radius.css:100: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:104: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:108: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:112: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:116: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
......@@ -55,55 +55,48 @@ h {
}
i {
border-bottom-left-radius: none;
border-bottom-right-radius: none;
border-top-left-radius: none;
border-top-right-radius: none;
}
j {
border-bottom-left-radius: 1.125 5.5;
border-bottom-right-radius: 1.125 5.5;
border-top-left-radius: 1.125 5.5;
border-top-right-radius: 1.125 5.5;
}
k {
j {
border-bottom-left-radius: 2.25 5;
border-bottom-right-radius: 1 5;
border-top-left-radius: 1 5;
border-top-right-radius: 2.25 5;
}
l {
k {
border-bottom-left-radius: 2 6.75;
border-bottom-right-radius: 3.5 5.5;
border-top-left-radius: 1 5.5;
border-top-right-radius: 2 6.75;
}
m {
l {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
n {
m {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
o {
n {
border-bottom-left-radius: 0 1;
border-bottom-right-radius: 0 1;
border-top-left-radius: 0 1;
border-top-right-radius: 0 1;
}
p {
o {
border-bottom-left-radius: 1 0;
border-bottom-right-radius: 1 0;
border-top-left-radius: 1 0;
......
......@@ -53,7 +53,3 @@ m {
n {
border-property: 1 2 ; 4;
}
o {
border-property: none
}
......@@ -25,7 +25,3 @@ f {
n {
border-property: 1 2;
}
o {
border-property: none;
}
a {
font-family: none;
font-family: "none";
}
b {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment