Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-12 17:05:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Add 'row-gap' and 'gap' properties; make 'grid-[column|row]-gap' and 'grid-gap' alias the respective unprefixed properties.

Browse source 
This also makes 'normal' the initial value for the grid-*
properties, per:
https://github.com/w3c/csswg-drafts/issues/2294#issuecomment-369313438

Bug: 1398482
Reviewed-by: emilio
This commit is contained in:
Mats Palmgren 2018-04-24 01:52:51 +02:00 • committed by Emilio Cobos Álvarez
parent e5878b96a9
commit 62c6f58a5b
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/style/properties/shorthand/position.mako.rs
View file

@ -108,30 +108,30 @@
}
</%helpers:shorthand>
<%helpers:shorthand name="grid-gap" sub_properties="grid-row-gap grid-column-gap"
spec="https://drafts.csswg.org/css-grid/#propdef-grid-gap"
<%helpers:shorthand name="gap" alias="grid-gap" sub_properties="row-gap column-gap"
spec="https://drafts.csswg.org/css-align-3/#gap-shorthand"
products="gecko">
use properties::longhands::{grid_row_gap, grid_column_gap};
use properties::longhands::{row_gap, column_gap};
pub fn parse_value<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
-> Result<Longhands, ParseError<'i>> {
let row_gap = grid_row_gap::parse(context, input)?;
let column_gap = input.try(|input| grid_column_gap::parse(context, input)).unwrap_or(row_gap.clone());
let r_gap = row_gap::parse(context, input)?;
let c_gap = input.try(|input| column_gap::parse(context, input)).unwrap_or(r_gap.clone());
Ok(expanded! {
grid_row_gap: row_gap,
grid_column_gap: column_gap,
row_gap: r_gap,
column_gap: c_gap,
})
}
impl<'a> ToCss for LonghandsToSerialize<'a> {
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result where W: fmt::Write {
if self.grid_row_gap == self.grid_column_gap {
self.grid_row_gap.to_css(dest)
if self.row_gap == self.column_gap {
self.row_gap.to_css(dest)
} else {
self.grid_row_gap.to_css(dest)?;
self.row_gap.to_css(dest)?;
dest.write_str(" ")?;
self.grid_column_gap.to_css(dest)
self.column_gap.to_css(dest)
}
}
}