diff options
author | hwc487 | 2012-05-31 17:11:08 -0700 |
---|---|---|
committer | hwc487 | 2012-05-31 17:11:08 -0700 |
commit | 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch) | |
tree | 35271ad7ffec86fde9102af3dd954fa3a2974582 /js/panels/CSSPanel/css-value-completion-map.js | |
parent | 335ce503996e3ccbd2909086328d0a31fbd03370 (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'js/panels/CSSPanel/css-value-completion-map.js')
-rwxr-xr-x | js/panels/CSSPanel/css-value-completion-map.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/js/panels/CSSPanel/css-value-completion-map.js b/js/panels/CSSPanel/css-value-completion-map.js index 773fde96..44d7332f 100755 --- a/js/panels/CSSPanel/css-value-completion-map.js +++ b/js/panels/CSSPanel/css-value-completion-map.js | |||
@@ -109,9 +109,6 @@ exports.cssValueCompletionMap = { | |||
109 | "border-top-width": [ | 109 | "border-top-width": [ |
110 | "medium", "thick", "thin" | 110 | "medium", "thick", "thin" |
111 | ], | 111 | ], |
112 | "outline-color": [ | ||
113 | "invert" | ||
114 | ], | ||
115 | "text-line-through-style": [ | 112 | "text-line-through-style": [ |
116 | "none", "dotted", "dashed", "solid", "double", "dot-dash", "dot-dot-dash", "wave" | 113 | "none", "dotted", "dashed", "solid", "double", "dot-dash", "dot-dot-dash", "wave" |
117 | ], | 114 | ], |
@@ -218,7 +215,7 @@ exports.cssValueCompletionMap = { | |||
218 | "text-overline-color" : colorKeywords, | 215 | "text-overline-color" : colorKeywords, |
219 | "background-color" : colorKeywords, | 216 | "background-color" : colorKeywords, |
220 | "-webkit-text-emphasis-color" : colorKeywords, | 217 | "-webkit-text-emphasis-color" : colorKeywords, |
221 | "outline-color" : colorKeywords, | 218 | "outline-color" : colorKeywords.concat(["invert"]), |
222 | "text-underline-color" : colorKeywords, | 219 | "text-underline-color" : colorKeywords, |
223 | "color" : colorKeywords, | 220 | "color" : colorKeywords, |
224 | "color-rendering": [ | 221 | "color-rendering": [ |