diff options
| author | bors-servo <release+servo@mozilla.com> | 2013-11-11 16:52:34 -0800 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2013-11-11 16:52:34 -0800 |
| commit | 433f19f5a310f71273f03504261568d393e648ea (patch) | |
| tree | 47dcece670d2919352d1a554a8177d1d0cad5125 /src | |
| parent | 4297aa33add0c4f2b0100bd5b876022f71aa089e (diff) | |
| parent | 90f88dcc06d6e849046a148b5b7dcdedb5fecd49 (diff) | |
| download | servo-433f19f5a310f71273f03504261568d393e648ea.tar.gz servo-433f19f5a310f71273f03504261568d393e648ea.zip | |
auto merge of #1216 : june0cho/servo/temp_fix_tableflow, r=kmcallister
In order to fix the wikipedia error, I temporarily change the display property of table-related elements to 'block' instead of 'inline'.
When table is implemented, it should be changed to proper value.
@sonwow
@brson
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/main/layout/box_builder.rs | 5 | ||||
| -rw-r--r-- | src/components/style/properties.rs.mako | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/components/main/layout/box_builder.rs b/src/components/main/layout/box_builder.rs index 6b72794a121..80d76b68aff 100644 --- a/src/components/main/layout/box_builder.rs +++ b/src/components/main/layout/box_builder.rs @@ -388,6 +388,11 @@ impl LayoutTreeBuilder { let display = match node.type_id() { ElementNodeTypeId(_) => match node.style().Box.display { display::none => return NoGenerator, + display::table | display::inline_table | display::table_row_group + | 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::block, display => display, }, TextNodeTypeId => display::inline, diff --git a/src/components/style/properties.rs.mako b/src/components/style/properties.rs.mako index 6204a567181..7d1788d371d 100644 --- a/src/components/style/properties.rs.mako +++ b/src/components/style/properties.rs.mako @@ -225,10 +225,11 @@ pub mod longhands { // TODO: don't parse values we don't support <%self:single_keyword_computed name="display" - values="inline block inline-block none"> + 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 + none"> // list-item -// table inline-table table-row-group table-header-group table-footer-group -// table-row table-column-group table-column table-cell table-caption pub fn to_computed_value(value: SpecifiedValue, context: &computed::Context) -> computed_value::T { // if context.is_root_element && value == list_item { |