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

servo · Nov 13, 2013 · 77603b2 · 77603b2
2 parents 4eb8449 + 98c3c09
commit 77603b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/components/main/layout/box_builder.rs b/src/components/main/layout/box_builder.rs
@@ -392,6 +392,7 @@ impl LayoutTreeBuilder {
                     | display::table_header_group | display::table_footer_group
                     | display::table_row | display::table_column_group
                     | display::table_column | display::table_cell | display::table_caption
+                    | display::list_item
                     => display::block,
                 display => display,
             },

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