Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2785 from glennw/content-font-size

Browse source 
Make pseudo :before and :after elements inherit style from attached
This commit is contained in:
Simon Sapin 2014-07-08 18:23:16 +01:00
commit a9e5457588
4 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/layout/css/matching.rs
View file

@ -553,14 +553,14 @@ impl<'ln> MatchMethods for LayoutNode<'ln> {
applicable_declarations_cache, applicable_declarations_cache,
applicable_declarations.normal_shareable); applicable_declarations.normal_shareable);
if applicable_declarations.before.len() > 0 { if applicable_declarations.before.len() > 0 {
self.cascade_node_pseudo_element(parent_style, self.cascade_node_pseudo_element(Some(layout_data.shared_data.style.get_ref()),
applicable_declarations.before.as_slice(), applicable_declarations.before.as_slice(),
&mut layout_data.data.before_style, &mut layout_data.data.before_style,
applicable_declarations_cache, applicable_declarations_cache,
false); false);
} }
if applicable_declarations.after.len() > 0 { if applicable_declarations.after.len() > 0 {
self.cascade_node_pseudo_element(parent_style, self.cascade_node_pseudo_element(Some(layout_data.shared_data.style.get_ref()),
applicable_declarations.after.as_slice(), applicable_declarations.after.as_slice(),
&mut layout_data.data.after_style, &mut layout_data.data.after_style,
applicable_declarations_cache, applicable_declarations_cache,

1
src/test/ref/basic.list
View file

@ -82,3 +82,4 @@
== position_fixed_background_color_a.html position_fixed_background_color_b.html == position_fixed_background_color_a.html position_fixed_background_color_b.html
== position_fixed_overflow_a.html position_fixed_overflow_b.html == position_fixed_overflow_a.html position_fixed_overflow_b.html
== noscript.html noscript_ref.html == noscript.html noscript_ref.html
== pseudo_inherit.html pseudo_inherit_ref.html

17
src/test/ref/pseudo_inherit.html Normal file
View file

@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<style type="text/css">
p:before {
content: "A";
}
.big {
font-size: 128px;
}
</style>
</head>
<body style="color: red; font-size: 64px;">
<p style="color: green;" class="big">B</p>
</body>
</html>

14
src/test/ref/pseudo_inherit_ref.html Normal file
View file

@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<style type="text/css">
.big {
font-size: 128px;
}
</style>
</head>
<body>
<p style="color: green;" class="big">AB</p>
</body>
</html>