diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-02-11 23:05:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 23:05:37 -0500 |
| commit | 6d6d16f7f492e6346f0391e352015226a4444806 (patch) | |
| tree | d991c986a7f83be25157934e93c248ea86ee4b00 /components/style/values/generics/text.rs | |
| parent | baac1e2c69d3b6e840ced2be4b5e03bb39bd40d5 (diff) | |
| parent | d1f8d576f83714fe674a36c5b718341c236312e6 (diff) | |
| download | servo-6d6d16f7f492e6346f0391e352015226a4444806.tar.gz servo-6d6d16f7f492e6346f0391e352015226a4444806.zip | |
Auto merge of #25717 - emilio:gecko-sync, r=emilio,nox
style: Sync changes from mozilla-central.
See individual commits for details. https://bugzilla.mozilla.org/show_bug.cgi?id=1614394
Diffstat (limited to 'components/style/values/generics/text.rs')
| -rw-r--r-- | components/style/values/generics/text.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/style/values/generics/text.rs b/components/style/values/generics/text.rs index fd434cc1273..ceeb59a3d0c 100644 --- a/components/style/values/generics/text.rs +++ b/components/style/values/generics/text.rs @@ -123,8 +123,8 @@ impl<N, L> LineHeight<N, L> { } } -/// Implements type for text-underline-offset and text-decoration-thickness -/// which take the grammar of auto | from-font | <length> +/// Implements type for text-decoration-thickness +/// which takes the grammar of auto | from-font | <length> | <percentage> /// /// https://drafts.csswg.org/css-text-decor-4/ #[repr(C, u8)] @@ -148,7 +148,7 @@ impl<N, L> LineHeight<N, L> { )] #[allow(missing_docs)] pub enum GenericTextDecorationLength<L> { - Length(L), + LengthPercentage(L), Auto, FromFont, } |