Skip to content

Commit 7529be2

Browse files
committed
Reorganize
1 parent 390e1ef commit 7529be2

File tree

19 files changed

+417
-373
lines changed

19 files changed

+417
-373
lines changed

src/properties/align.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use cssparser::*;
22
use crate::macros::*;
3-
use crate::values::length::{LengthPercentageOrAuto, LengthPercentage, Length, Percentage};
3+
use crate::values::length::LengthPercentage;
44
use crate::traits::{Parse, ToCss, PropertyHandler};
55
use super::Property;
66
use crate::printer::Printer;

src/properties/background.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
use cssparser::*;
2-
use crate::values::length::{HorizontalPosition, HorizontalPositionKeyword, VerticalPosition, VerticalPositionKeyword, LengthPercentage, LengthPercentageOrAuto, Percentage};
2+
use crate::values::{
3+
length::{LengthPercentage, LengthPercentageOrAuto},
4+
position::*,
5+
percentage::Percentage,
6+
color::CssColor,
7+
image::Image
8+
};
39
use crate::traits::{Parse, ToCss, PropertyHandler};
410
use crate::macros::*;
5-
use crate::values::{color::CssColor, image::Image};
611
use crate::properties::Property;
712
use itertools::izip;
813
use crate::printer::Printer;

src/properties/border_image.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::values::length::{*, NumberOrPercentage};
1+
use crate::values::{length::*, percentage::{Percentage, NumberOrPercentage}, number::serialize_number};
22
use cssparser::*;
33
use crate::traits::{Parse, ToCss, PropertyHandler};
44
use crate::properties::Property;

src/properties/border_radius.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use crate::values::length::*;
2+
use crate::values::size::Size2D;
23
use cssparser::*;
34
use crate::traits::{Parse, ToCss, PropertyHandler};
45
use crate::properties::Property;

src/properties/box_shadow.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
use cssparser::*;
2-
use crate::values::length::{HorizontalPosition, HorizontalPositionKeyword, VerticalPosition, VerticalPositionKeyword, Length, Unit, LengthPercentage, LengthPercentageOrAuto, Percentage};
3-
use crate::traits::{Parse, ToCss, PropertyHandler};
4-
use crate::macros::*;
5-
use crate::values::{color::CssColor, image::Image};
6-
use crate::properties::Property;
7-
use itertools::izip;
2+
use crate::values::length::Length;
3+
use crate::traits::{Parse, ToCss};
4+
use crate::values::color::CssColor;
85
use crate::printer::Printer;
96
use std::fmt::Write;
107

src/properties/flex.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
use cssparser::*;
22
use crate::macros::*;
3-
use crate::values::length::{LengthPercentageOrAuto, LengthPercentage, Length, Percentage};
3+
use crate::values::{
4+
length::{LengthPercentageOrAuto, LengthPercentage, Length},
5+
percentage::Percentage
6+
};
47
use crate::traits::{Parse, ToCss, PropertyHandler};
58
use super::Property;
69
use crate::printer::Printer;

src/properties/font.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use cssparser::*;
22
use crate::macros::*;
33
use crate::values::{
44
angle::Angle,
5-
length::{LengthPercentage, Percentage}
5+
length::LengthPercentage,
6+
percentage::Percentage
67
};
78
use crate::traits::{Parse, ToCss, PropertyHandler};
89
use super::Property;

src/properties/margin_padding.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
use crate::values::{length::{Size2D, LengthPercentageOrAuto}, rect::Rect};
1+
use crate::values::{
2+
size::Size2D,
3+
length::LengthPercentageOrAuto,
4+
rect::Rect
5+
};
26
use crate::properties::Property;
37
use crate::traits::PropertyHandler;
48

src/properties/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use border_radius::*;
2727
use transition::*;
2828
use animation::*;
2929
use transform::*;
30-
use crate::values::{image::*, length::*, rect::*, color::*, time::Time, ident::CustomIdent, easing::EasingFunction};
30+
use crate::values::{image::*, length::*, position::*, alpha::*, size::*, rect::*, color::*, time::Time, ident::CustomIdent, easing::EasingFunction};
3131
use crate::traits::{Parse, ToCss};
3232
use crate::printer::Printer;
3333
use std::fmt::Write;

src/properties/transform.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use cssparser::*;
22
use crate::traits::{Parse, ToCss};
33
use crate::values::{
44
angle::Angle,
5-
length::{LengthPercentage, NumberOrPercentage, Length, Unit}
5+
percentage::NumberOrPercentage,
6+
length::{LengthPercentage, Length, Unit}
67
};
78
use crate::printer::Printer;
89
use std::fmt::Write;

0 commit comments

Comments
 (0)