Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: justify-self does accept a <baseline-position>.

Browse source 
Unlike justify-content, as weird as it is.
This commit is contained in:
Emilio Cobos Álvarez 2018-01-30 17:16:12 +01:00
parent 76b4e5cefb
commit 5abaadf006
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/style/values/specified/align.rs
View file

@ -302,10 +302,6 @@ impl SelfAlignment {
/// Returns whether this value is valid for both axis directions.
pub fn is_valid_on_both_axes(&self) -> bool {
match self.0.value() {
// <baseline-position> is only allowed on the block axis.
AlignFlags::BASELINE |
AlignFlags::LAST_BASELINE => false,
// left | right are only allowed on the inline axis.
AlignFlags::LEFT |
AlignFlags::RIGHT => false,
@ -325,11 +321,12 @@ impl SelfAlignment {
input: &mut Parser<'i, 't>,
axis: AxisDirection,
) -> Result<Self, ParseError<'i>> {
// <baseline-position>, only on the block axis.
if axis == AxisDirection::Block {
if let Ok(value) = input.try(parse_baseline) {
return Ok(SelfAlignment(value));
}
// <baseline-position>
//
// It's weird that this accepts <baseline-position>, but not
// justify-content...
if let Ok(value) = input.try(parse_baseline) {
return Ok(SelfAlignment(value));
}
// auto | normal | stretch
@ -465,8 +462,8 @@ impl Parse for JustifyItems {
fn parse<'i, 't>(_: &ParserContext, input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i>> {
// <baseline-position>
//
// It's weird that this accepts <baseline-position>, but not the
// justify-self / justify-content properties...
// It's weird that this accepts <baseline-position>, but not
// justify-content...
if let Ok(baseline) = input.try(parse_baseline) {
return Ok(JustifyItems(baseline));
}
@ -511,7 +508,7 @@ fn parse_auto_normal_stretch<'i, 't>(
}
}
// normal | stretch | <baseline-position>
// normal | stretch
fn parse_normal_stretch<'i, 't>(input: &mut Parser<'i, 't>) -> Result<AlignFlags, ParseError<'i>> {
try_match_ident_ignore_ascii_case! { input,
"normal" => Ok(AlignFlags::NORMAL),