Auto merge of #16683 - nox:place-content, r=emilio

Fix serialisation of place-content

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16683)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-01 19:57:40 -05:00 committed by GitHub
commit 8850a01b81

View file

@ -266,13 +266,12 @@
impl<'a> ToCss for LonghandsToSerialize<'a> {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
if self.align_content == self.justify_content {
self.align_content.to_css(dest)
} else {
self.justify_content.to_css(dest)?;
self.align_content.to_css(dest)?;
if self.align_content != self.justify_content {
dest.write_str(" ")?;
self.justify_content.to_css(dest)
self.justify_content.to_css(dest)?;
}
Ok(())
}
}
</%helpers:shorthand>