aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel/css-shorthand-map.js
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/CSSPanel/css-shorthand-map.js
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/CSSPanel/css-shorthand-map.js')
-rwxr-xr-xjs/panels/CSSPanel/css-shorthand-map.js22
1 files changed, 11 insertions, 11 deletions
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js
index dc0b4a55..92abcf1b 100755
--- a/js/panels/CSSPanel/css-shorthand-map.js
+++ b/js/panels/CSSPanel/css-shorthand-map.js
@@ -38,56 +38,56 @@ exports.CSS_SHORTHAND_MAP = {
38 'background-position-y' : ['background', 'background-position'], 38 'background-position-y' : ['background', 'background-position'],
39 'background-repeat-x' : ['background', 'background-repeat'], 39 'background-repeat-x' : ['background', 'background-repeat'],
40 'background-repeat-y' : ['background', 'background-repeat'], 40 'background-repeat-y' : ['background', 'background-repeat'],
41 41
42 'border-bottom' : ['border'], 42 'border-bottom' : ['border'],
43 'border-bottom-color' : ['border-bottom'], 43 'border-bottom-color' : ['border-bottom'],
44 'border-bottom-style' : ['border-bottom'], 44 'border-bottom-style' : ['border-bottom'],
45 'border-bottom-width' : ['border-bottom'], 45 'border-bottom-width' : ['border-bottom'],
46 46
47 'border-left' : ['border'], 47 'border-left' : ['border'],
48 'border-left-color' : ['border-left'], 48 'border-left-color' : ['border-left'],
49 'border-left-style' : ['border-left'], 49 'border-left-style' : ['border-left'],
50 'border-left-width' : ['border-left'], 50 'border-left-width' : ['border-left'],
51 51
52 'border-right' : ['border'], 52 'border-right' : ['border'],
53 'border-right-color' : ['border-right'], 53 'border-right-color' : ['border-right'],
54 'border-right-style' : ['border-right'], 54 'border-right-style' : ['border-right'],
55 'border-right-width' : ['border-right'], 55 'border-right-width' : ['border-right'],
56 56
57 'border-top' : ['border'], 57 'border-top' : ['border'],
58 'border-top-color' : ['border-top'], 58 'border-top-color' : ['border-top'],
59 'border-top-style' : ['border-top'], 59 'border-top-style' : ['border-top'],
60 'border-top-width' : ['border-top'], 60 'border-top-width' : ['border-top'],
61 61
62 'border-color' : ['border'], 62 'border-color' : ['border'],
63 'border-style' : ['border'], 63 'border-style' : ['border'],
64 64
65 'border-image-outset' : ['border-image'], 65 'border-image-outset' : ['border-image'],
66 'border-image-repeat' : ['border-image'], 66 'border-image-repeat' : ['border-image'],
67 'border-image-slice' : ['border-image'], 67 'border-image-slice' : ['border-image'],
68 'border-image-source' : ['border-image'], 68 'border-image-source' : ['border-image'],
69 'border-image-width' : ['border-image'], 69 'border-image-width' : ['border-image'],
70 70
71 'border-bottom-left-radius' : ['border-radius'], 71 'border-bottom-left-radius' : ['border-radius'],
72 'border-bottom-right-radius' : ['border-radius'], 72 'border-bottom-right-radius' : ['border-radius'],
73 'border-top-left-radius' : ['border-radius'], 73 'border-top-left-radius' : ['border-radius'],
74 'border-top-right-radius' : ['border-radius'], 74 'border-top-right-radius' : ['border-radius'],
75 75
76 'font-style' : ['font'], 76 'font-style' : ['font'],
77 'font-family' : ['font'], 77 'font-family' : ['font'],
78 'font-size' : ['font'], 78 'font-size' : ['font'],
79 'font-variant' : ['font'], 79 'font-variant' : ['font'],
80 'font-weight' : ['font'], 80 'font-weight' : ['font'],
81 81
82 'list-style-image' : ['list-style'], 82 'list-style-image' : ['list-style'],
83 'list-style-position' : ['list-style'], 83 'list-style-position' : ['list-style'],
84 'list-style-type' : ['list-style'], 84 'list-style-type' : ['list-style'],
85 85
86 'margin-bottom' : ['margin'], 86 'margin-bottom' : ['margin'],
87 'margin-left' : ['margin'], 87 'margin-left' : ['margin'],
88 'margin-right' : ['margin'], 88 'margin-right' : ['margin'],
89 'margin-top' : ['margin'], 89 'margin-top' : ['margin'],
90 90
91 'padding-bottom' : ['padding'], 91 'padding-bottom' : ['padding'],
92 'padding-left' : ['padding'], 92 'padding-left' : ['padding'],
93 'padding-right' : ['padding'], 93 'padding-right' : ['padding'],