Tsumanu/bitque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:adrian.wozniak/jirs

Browse Source
This commit is contained in:
Adrian Woźniak 2020-04-30 15:00:26 +02:00
commit d60c524f5c
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jirs-css/src/prop/mod.rs
View File

@ -371,7 +371,7 @@ impl CssParser {
// "clip" => Property::Clip,
// "clip-path" => Property::ClipPath,
"color" => Property::Color(self.parse_full_token()?),
// "column-count" => Property::ColumnCount,
"column-count" => Property::ColumnCount(self.parse_full_token()?),
// "column-fill" => Property::ColumnFill,
// "column-gap" => Property::ColumnGap,
// "column-rule" => Property::ColumnRule,
@ -956,6 +956,27 @@ impl ParseToken<AllProperty> for CssParser {
}
}
#[derive(Debug, PartialEq)]
pub enum ColumnCountProperty {
Auto,
Number(u32),
}
impl Token for ColumnCountProperty {}
impl ParseToken<ColumnCountProperty> for CssParser {
fn parse_token(&mut self) -> ValueResult<ColumnCountProperty> {
let p = match self.expect_consume()?.as_str() {
"auto" => ColumnCountProperty::Auto,
s @ _ => ColumnCountProperty::Number(
s.parse::<u32>()
.map_err(|_| format!("invalid column count"))?,
),
};
Ok(PropertyValue::Other(p))
}
}
#[derive(Debug, PartialEq)]
pub enum JustifyContentProperty {
FlexStart,
@ -1418,7 +1439,7 @@ pub enum Property {
Clip(String),
ClipPath(String),
Color(PropertyValue<ColorProperty>),
ColumnCount(String),
ColumnCount(PropertyValue<ColumnCountProperty>),
ColumnFill(String),
ColumnGap(String),
ColumnRule(String),