diff options
author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/panels/CSSPanel/css-value-completion-map.js | |
parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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": [ |