Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename entities that belong to text-emphasis-style value. Fix order of imports

Browse source
This commit is contained in:
Dmitry 2018-03-09 20:21:18 +03:00
parent acdb4df53b
commit a1dd888c23
5 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/values/computed/mod.rs
View file

@ -75,7 +75,7 @@ pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
pub use self::svg::MozContextProperties;
pub use self::table::XSpan;
pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize};
pub use self::text::{TextAlign, TextOverflow, WordSpacing, TextEmphasisStyle};
pub use self::text::{TextAlign, TextEmphasisStyle, TextOverflow, WordSpacing};
pub use self::time::Time;
pub use self::transform::{Rotate, Scale, TimingFunction, Transform, TransformOperation};
pub use self::transform::{TransformOrigin, TransformStyle, Translate};

12
components/style/values/computed/text.rs
View file

@ -15,7 +15,7 @@ use values::generics::text::InitialLetter as GenericInitialLetter;
use values::generics::text::LineHeight as GenericLineHeight;
use values::generics::text::MozTabSize as GenericMozTabSize;
use values::generics::text::Spacing;
use values::specified::text::{TextOverflowSide, TextDecorationLine, FillMode, ShapeKeyword};
use values::specified::text::{TextDecorationLine, TextEmphasisFillMode, TextEmphasisShapeKeyword, TextOverflowSide};
pub use values::specified::TextAlignKeyword as TextAlign;
@ -156,18 +156,18 @@ pub type MozTabSize = GenericMozTabSize<NonNegativeNumber, NonNegativeLength>;
#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
pub enum TextEmphasisStyle {
/// Keyword value for the text-emphasis-style property (`filled` `open`)
Keyword(KeywordValue),
Keyword(TextEmphasisKeywordValue),
/// `none`
None,
/// String (will be used only first character) for the text-emphasis-style property
/// String (will be used only first grapheme cluster) for the text-emphasis-style property
String(String),
}
/// Keyword value for the text-emphasis-style property
#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
pub struct KeywordValue {
pub struct TextEmphasisKeywordValue {
/// fill for the text-emphasis-style property
pub fill: FillMode,
pub fill: TextEmphasisFillMode,
/// shape for the text-emphasis-style property
pub shape: ShapeKeyword,
pub shape: TextEmphasisShapeKeyword,
}