aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/inline.rs
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2015-05-08 17:58:42 -0700
committerPatrick Walton <pcwalton@mimiga.net>2015-05-08 17:59:01 -0700
commit614c87752774c63c452e4438eb881bcf7bdcff49 (patch)
tree5cf6e378ac0d2a895d8cbaf6e8f5cbbb2418d76c /components/layout/inline.rs
parent49b73c0bfe50366e767525f9f90c5aa348f68f18 (diff)
downloadservo-614c87752774c63c452e4438eb881bcf7bdcff49.tar.gz
servo-614c87752774c63c452e4438eb881bcf7bdcff49.zip
layout: Support `vertical-align` for inline-blocks.
Improves Twitter.
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r--components/layout/inline.rs12
1 files changed, 7 insertions, 5 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index b25f47ad172..03548ce8483 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -813,9 +813,9 @@ impl InlineFlow {
for style in fragment.inline_styles() {
// Ignore `vertical-align` values for table cells.
let box_style = style.get_box();
- if box_style.display != display::T::inline &&
- box_style.display != display::T::block {
- continue
+ match box_style.display {
+ display::T::inline | display::T::block | display::T::inline_block => {}
+ _ => continue,
}
match box_style.vertical_align {
@@ -1030,12 +1030,14 @@ impl InlineFlow {
for style in fragment.inline_styles() {
match (style.get_box().display, style.get_box().vertical_align) {
(display::T::inline, vertical_align::T::top) |
- (display::T::block, vertical_align::T::top) => {
+ (display::T::block, vertical_align::T::top) |
+ (display::T::inline_block, vertical_align::T::top) => {
vertical_align = vertical_align::T::top;
break
}
(display::T::inline, vertical_align::T::bottom) |
- (display::T::block, vertical_align::T::bottom) => {
+ (display::T::block, vertical_align::T::bottom) |
+ (display::T::inline_block, vertical_align::T::bottom) => {
vertical_align = vertical_align::T::bottom;
break
}