aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-10-29 14:16:13 -0500
committerGitHub <noreply@github.com>2016-10-29 14:16:13 -0500
commit47d29fd056d1ee5dffdf04c8daf1e097bdd3f38f (patch)
tree620bbfdb638f5fdce1655d2a430f85df0a69f6cf
parent3ae0a3335dbaf3f67c775a1853941ed538d97563 (diff)
parent41b003fc30f4aa3ab58b709cc1dd2a1006324a1f (diff)
downloadservo-47d29fd056d1ee5dffdf04c8daf1e097bdd3f38f.tar.gz
servo-47d29fd056d1ee5dffdf04c8daf1e097bdd3f38f.zip
Auto merge of #13978 - Haggus:master, r=emilio
Implement column-fill Implemented column-fill from #13764 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/13978) <!-- Reviewable:end -->
-rw-r--r--components/style/properties/longhand/column.mako.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/components/style/properties/longhand/column.mako.rs b/components/style/properties/longhand/column.mako.rs
index 575438325a7..6c82cee77f9 100644
--- a/components/style/properties/longhand/column.mako.rs
+++ b/components/style/properties/longhand/column.mako.rs
@@ -251,3 +251,6 @@
}
}
</%helpers:longhand>
+
+${helpers.single_keyword("column-fill", "auto balance",
+ products="gecko", animatable=False)}