diff options
author | Eric Guzman | 2012-03-12 15:23:04 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-12 15:23:04 -0700 |
commit | 7130541631a84b524824c0c4247f5dc73ef4c91c (patch) | |
tree | c28574b714f1db1859be8b69a0b49ab6beb71d7e /js | |
parent | 1433f2bdf2e5b8c5c18fed5e9c17fd983ab3606d (diff) | |
download | ninja-7130541631a84b524824c0c4247f5dc73ef4c91c.tar.gz |
CSS Updates - Update the shorthand map to include other order
Diffstat (limited to 'js')
-rwxr-xr-x | js/panels/CSSPanel/css-shorthand-map.js | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js index bc43ebc4..191dbae5 100755 --- a/js/panels/CSSPanel/css-shorthand-map.js +++ b/js/panels/CSSPanel/css-shorthand-map.js | |||
@@ -52,7 +52,6 @@ exports.CSS_SHORTHAND_MAP = { | |||
52 | 'font-style' : ['font'], | 52 | 'font-style' : ['font'], |
53 | 'font-family' : ['font'], | 53 | 'font-family' : ['font'], |
54 | 'font-size' : ['font'], | 54 | 'font-size' : ['font'], |
55 | 'font-style' : ['font'], | ||
56 | 'font-variant' : ['font'], | 55 | 'font-variant' : ['font'], |
57 | 'font-weight' : ['font'], | 56 | 'font-weight' : ['font'], |
58 | 57 | ||
@@ -74,4 +73,21 @@ exports.CSS_SHORTHAND_MAP = { | |||
74 | '-webkit-transition-duration' : ['-webkit-transition'], | 73 | '-webkit-transition-duration' : ['-webkit-transition'], |
75 | '-webkit-transition-timing-function' : ['-webkit-transition'], | 74 | '-webkit-transition-timing-function' : ['-webkit-transition'], |
76 | '-webkit-transition-delay' : ['-webkit-transition'] | 75 | '-webkit-transition-delay' : ['-webkit-transition'] |
76 | }; | ||
77 | |||
78 | exports.CSS_SHORTHAND_TO_SUBPROP_MAP = { | ||
79 | 'background' : ["background-image", "background-repeat-x", "background-repeat-y", "background-attachment", | ||
80 | "background-position-x", "background-position-y", "background-origin", "background-clip", | ||
81 | "background-color"], | ||
82 | 'border' : ["border-top-width", "border-right-width", "border-bottom-width", "border-left-width", | ||
83 | "border-top-style", "border-right-style", "border-bottom-style", "border-left-style", | ||
84 | "border-top-color", "border-right-color", "border-bottom-color", "border-left-color", "border-image"], | ||
85 | 'border-radius' : ["border-top-left-radius", "border-top-right-radius", "border-bottom-right-radius", | ||
86 | "border-bottom-left-radius"], | ||
87 | 'font' : ["font-family", "font-size", "font-style", "font-variant", "font-weight", "line-height"], | ||
88 | 'list' : ["list-style-type", "list-style-image", "list-style-position"], | ||
89 | 'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"], | ||
90 | 'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"], | ||
91 | '-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration", | ||
92 | "-webkit-transition-timing-function", "-webkit-transition-delay"] | ||
77 | }; \ No newline at end of file | 93 | }; \ No newline at end of file |