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

Auto merge of #15594 - mbrubeck:align-content-fix, r=Manishearth

Browse source 
Fix initial value of align-content and justify-content

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

<!-- 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/15594)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-02-16 18:16:28 -08:00 • committed by GitHub
commit 3fa9ce16db
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
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. // 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", ${helpers.single_keyword("justify-content", "stretch flex-start flex-end center space-between space-around",
extra_prefixes="webkit", 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)} animatable=False)}
% else: % else:
${helpers.predefined_type(name="justify-content", ${helpers.predefined_type(name="justify-content",
type="AlignJustifyContent", type="AlignJustifyContent",
initial_value="specified::AlignJustifyContent::auto()", initial_value="specified::AlignJustifyContent::normal()",
spec="https://drafts.csswg.org/css-flexbox/#justify-content-property", spec="https://drafts.csswg.org/css-align/#propdef-justify-content",
extra_prefixes="webkit", extra_prefixes="webkit",
animatable=False)} animatable=False)}
% endif % 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. // 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", ${helpers.single_keyword("align-content", "stretch flex-start flex-end center space-between space-around",
extra_prefixes="webkit", 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)} animatable=False)}
% else: % else:
${helpers.predefined_type(name="align-content", ${helpers.predefined_type(name="align-content",
type="AlignJustifyContent", type="AlignJustifyContent",
initial_value="specified::AlignJustifyContent::auto()", initial_value="specified::AlignJustifyContent::normal()",
spec="https://drafts.csswg.org/css-flexbox/#align-content-property", spec="https://drafts.csswg.org/css-align/#propdef-align-content",
extra_prefixes="webkit", extra_prefixes="webkit",
animatable=False)} animatable=False)}
% endif % endif

6
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); pub struct AlignJustifyContent(u16);
impl AlignJustifyContent { impl AlignJustifyContent {
/// The initial value 'auto' /// The initial value 'normal'
#[inline] #[inline]
pub fn auto() -> Self { pub fn normal() -> Self {
Self::new(ALIGN_AUTO) Self::new(ALIGN_NORMAL)
} }
/// Construct a value with no fallback. /// Construct a value with no fallback.