Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1231 : sonwow/servo/list-item, r=SimonSapin

Browse source
This commit is contained in:
bors-servo 2013-11-13 20:34:30 -08:00
commit 85e0bfe7f7
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/main/layout/box_builder.rs
View file

@ -392,6 +392,7 @@ impl LayoutTreeBuilder {
| display::table_header_group | display::table_footer_group | display::table_header_group | display::table_footer_group
| display::table_row | display::table_column_group | display::table_row | display::table_column_group
| display::table_column | display::table_cell | display::table_caption | display::table_column | display::table_cell | display::table_caption
| display::list_item
=> display::block, => display::block,
display => display, display => display,
}, },

2
src/components/style/properties.rs.mako
View file

@ -228,8 +228,8 @@ pub mod longhands {
values="inline block inline-block values="inline block inline-block
table inline-table table-row-group table-header-group table-footer-group table inline-table table-row-group table-header-group table-footer-group
table-row table-column-group table-column table-cell table-caption table-row table-column-group table-column table-cell table-caption
list-item
none"> none">
// list-item
pub fn to_computed_value(value: SpecifiedValue, context: &computed::Context) pub fn to_computed_value(value: SpecifiedValue, context: &computed::Context)
-> computed_value::T { -> computed_value::T {
// if context.is_root_element && value == list_item { // if context.is_root_element && value == list_item {