summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2012-01-21 22:32:41 +0100
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2012-01-21 22:32:41 +0100
commitca3f6616f18019feec480af2e4d5898bad3969d0 (patch)
treea955dfe1c2d9f3bf114f001e503c5dcf2a8fad96
parenta987a45a6d6bdf27aecf1ef0625801834ab27e44 (diff)
add inline-block to possible display: values
-rw-r--r--dw/style.hh1
-rw-r--r--src/cssparser.cc4
2 files changed, 3 insertions, 2 deletions
diff --git a/dw/style.hh b/dw/style.hh
index dffb84bb..f69e5015 100644
--- a/dw/style.hh
+++ b/dw/style.hh
@@ -260,6 +260,7 @@ enum TextTransform {
enum DisplayType {
DISPLAY_BLOCK,
DISPLAY_INLINE,
+ DISPLAY_INLINE_BLOCK,
DISPLAY_LIST_ITEM,
DISPLAY_NONE,
DISPLAY_TABLE,
diff --git a/src/cssparser.cc b/src/cssparser.cc
index 306aa58c..ca41781e 100644
--- a/src/cssparser.cc
+++ b/src/cssparser.cc
@@ -71,8 +71,8 @@ static const char *const Css_cursor_enum_vals[] = {
};
static const char *const Css_display_enum_vals[] = {
- "block", "inline", "list-item", "none", "table", "table-row-group",
- "table-header-group", "table-footer-group", "table-row",
+ "block", "inline", "inline-block", "list-item", "none", "table",
+ "table-row-group", "table-header-group", "table-footer-group", "table-row",
"table-cell", NULL
};