diff options
| author | bors-servo <release+servo@mozilla.com> | 2013-11-13 20:34:30 -0800 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2013-11-13 20:34:30 -0800 |
| commit | 85e0bfe7f7a7a624cc8d730e37ea1bc24ddeaf98 (patch) | |
| tree | 606fc4545de028cfaa10523512d4939efd9b335c /src | |
| parent | 76b367ceb66e9ceef5c5a710543925bd13e2c7fb (diff) | |
| parent | 98c3c09e3eb815a25092b5f0248d426a3fe10b3f (diff) | |
| download | servo-85e0bfe7f7a7a624cc8d730e37ea1bc24ddeaf98.tar.gz servo-85e0bfe7f7a7a624cc8d730e37ea1bc24ddeaf98.zip | |
auto merge of #1231 : sonwow/servo/list-item, r=SimonSapin
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/main/layout/box_builder.rs | 1 | ||||
| -rw-r--r-- | src/components/style/properties.rs.mako | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/components/main/layout/box_builder.rs b/src/components/main/layout/box_builder.rs index 80d76b68aff..ee492c85304 100644 --- 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 index 7d1788d371d..e86de37b89a 100644 --- 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 { |