Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

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 = {
     "border-top-width": [
     "medium", "thick", "thin"
     ],
-    "outline-color": [
-    "invert"
-    ],
     "text-line-through-style": [
     "none", "dotted", "dashed", "solid", "double", "dot-dash", "dot-dot-dash", "wave"
     ],
@@ -218,7 +215,7 @@ exports.cssValueCompletionMap = {
     "text-overline-color" : colorKeywords,
     "background-color" : colorKeywords,
     "-webkit-text-emphasis-color" : colorKeywords,
-    "outline-color" : colorKeywords,
+    "outline-color" : colorKeywords.concat(["invert"]),
     "text-underline-color" : colorKeywords,
     "color" : colorKeywords,
     "color-rendering": [