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

Auto merge of #15617 - mbrubeck:border, r=upsuper

Browse source 
Fix -moz aliases for border-{start,end} properties

Fixes #15297. r? @upsuper or @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/15617)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-02-17 13:58:05 -08:00 • committed by GitHub
commit 9cb3e31c1d
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/properties/longhand/border.mako.rs
View file

@ -34,7 +34,7 @@
% for side in ALL_SIDES: % for side in ALL_SIDES:
<%helpers:longhand name="border-${side[0]}-width" animatable="True" logical="${side[1]}" <%helpers:longhand name="border-${side[0]}-width" animatable="True" logical="${side[1]}"
alias=maybe_moz_logical_alias(product, side, "-moz-border-%s-width") alias="${maybe_moz_logical_alias(product, side, '-moz-border-%s-width')}"
spec="${maybe_logical_spec(side, 'width')}"> spec="${maybe_logical_spec(side, 'width')}">
use app_units::Au; use app_units::Au;
use std::fmt; use std::fmt;

12
components/style/properties/shorthand/border.mako.rs
View file

@ -84,10 +84,14 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
if logical: if logical:
spec = "https://drafts.csswg.org/css-logical-props/#propdef-border-%s" % side spec = "https://drafts.csswg.org/css-logical-props/#propdef-border-%s" % side
%> %>
<%helpers:shorthand name="border-${side}" sub_properties="${' '.join( <%helpers:shorthand
'border-%s-%s' % (side, prop) name="border-${side}"
for prop in ['color', 'style', 'width'] sub_properties="${' '.join(
)}" alias=maybe_moz_logical_alias(product, side, "-moz-border-%s") spec="${spec}"> 'border-%s-%s' % (side, prop)
for prop in ['color', 'style', 'width']
)}"
alias="${maybe_moz_logical_alias(product, (side, logical), '-moz-border-%s')}"
spec="${spec}">
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> { pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
let (color, style, width) = try!(super::parse_border(context, input)); let (color, style, width) = try!(super::parse_border(context, input));