Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #15594 - Fix initial value of align-content and justify-content (from mbrubeck:align-content-fix); r=Manishearth

Browse Source 
This fixes a trivial mistake in #15533, caused by me misreading the spec. r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: 3fa9ce16db910c0b44617dafdcd8e76b6f813c61

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 668d521e0ecc9c92b9d5f7af48d72eeffc490815
This commit is contained in:
Matt Brubeck 2017-02-16 18:16:28 -08:00
parent dfe8d7eb9f
commit be415107d3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servo/components/style/properties/longhand/position.mako.rs
View File

@ -88,13 +88,13 @@ ${helpers.single_keyword("flex-wrap", "nowrap wrap wrap-reverse",
// FIXME: Update Servo to support the same Syntax as Gecko.
${helpers.single_keyword("justify-content", "stretch flex-start flex-end center space-between space-around",
extra_prefixes="webkit",
spec="https://drafts.csswg.org/css-flexbox/#justify-content-property",
spec="https://drafts.csswg.org/css-align/#propdef-justify-content",
animatable=False)}
% else:
${helpers.predefined_type(name="justify-content",
type="AlignJustifyContent",
initial_value="specified::AlignJustifyContent::auto()",
spec="https://drafts.csswg.org/css-flexbox/#justify-content-property",
initial_value="specified::AlignJustifyContent::normal()",
spec="https://drafts.csswg.org/css-align/#propdef-justify-content",
extra_prefixes="webkit",
animatable=False)}
% endif
@ -113,13 +113,13 @@ ${helpers.single_keyword("align-items", "stretch flex-start flex-end center base
// FIXME: Update Servo to support the same Syntax as Gecko.
${helpers.single_keyword("align-content", "stretch flex-start flex-end center space-between space-around",
extra_prefixes="webkit",
spec="https://drafts.csswg.org/css-flexbox/#align-content-property",
spec="https://drafts.csswg.org/css-align/#propdef-align-content",
animatable=False)}
% else:
${helpers.predefined_type(name="align-content",
type="AlignJustifyContent",
initial_value="specified::AlignJustifyContent::auto()",
spec="https://drafts.csswg.org/css-flexbox/#align-content-property",
initial_value="specified::AlignJustifyContent::normal()",
spec="https://drafts.csswg.org/css-align/#propdef-align-content",
extra_prefixes="webkit",
animatable=False)}
% endif

6
servo/components/style/values/specified/align.rs
View File

@ -117,10 +117,10 @@ const ALIGN_ALL_SHIFT: u32 = structs::NS_STYLE_ALIGN_ALL_SHIFT;
pub struct AlignJustifyContent(u16);
impl AlignJustifyContent {
/// The initial value 'auto'
/// The initial value 'normal'
#[inline]
pub fn auto() -> Self {
Self::new(ALIGN_AUTO)
pub fn normal() -> Self {
Self::new(ALIGN_NORMAL)
}
/// Construct a value with no fallback.