CSS Style Declaration - Improve shorthand filtering

1 files changed, 18 insertions, 15 deletions

diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js
index 191dbae5..d469e2a1 100755
--- a/js/panels/CSSPanel/css-shorthand-map.js
+++ b/js/panels/CSSPanel/css-shorthand-map.js
@@ -16,24 +16,24 @@ exports.CSS_SHORTHAND_MAP = {
     'background-repeat-y' : ['background', 'background-repeat'],
     
     'border-bottom' : ['border'],
-    'border-bottom-color' : ['border', 'border-bottom'],
-    'border-bottom-style' : ['border', 'border-bottom'],
-    'border-bottom-width' : ['border', 'border-bottom'],
+    'border-bottom-color' : ['border-bottom'],
+    'border-bottom-style' : ['border-bottom'],
+    'border-bottom-width' : ['border-bottom'],
     
     'border-left' : ['border'],
-    'border-left-color' : ['border', 'border-left'],
-    'border-left-style' : ['border', 'border-left'],
-    'border-left-width' : ['border', 'border-left'],
+    'border-left-color' : ['border-left'],
+    'border-left-style' : ['border-left'],
+    'border-left-width' : ['border-left'],
     
     'border-right' : ['border'],
-    'border-right-color' : ['border', 'border-right'],
-    'border-right-style' : ['border', 'border-right'],
-    'border-right-width' : ['border', 'border-right'],
+    'border-right-color' : ['border-right'],
+    'border-right-style' : ['border-right'],
+    'border-right-width' : ['border-right'],
     
     'border-top' : ['border'],
-    'border-top-color' : ['border', 'border-top'],
-    'border-top-style' : ['border', 'border-top'],
-    'border-top-width' : ['border', 'border-top'],
+    'border-top-color' : ['border-top'],
+    'border-top-style' : ['border-top'],
+    'border-top-width' : ['border-top'],
     
     'border-color' : ['border'],
     'border-style' : ['border'],
@@ -79,9 +79,12 @@ exports.CSS_SHORTHAND_TO_SUBPROP_MAP = {
     'background' : ["background-image", "background-repeat-x", "background-repeat-y", "background-attachment",
                     "background-position-x", "background-position-y", "background-origin", "background-clip",
                     "background-color"],
-    'border' : ["border-top-width", "border-right-width", "border-bottom-width", "border-left-width",
-                "border-top-style", "border-right-style", "border-bottom-style", "border-left-style",
-                "border-top-color", "border-right-color", "border-bottom-color", "border-left-color", "border-image"],
+    'border' : ['border-width', 'border-style', 'border-color'],
+    'border-top' : ['border-top-width', 'border-top-style', 'border-top-color'],
+    'border-right' : ['border-right-width', 'border-right-style', 'border-right-color'],
+    'border-bottom' : ['border-bottom-width', 'border-bottom-style', 'border-bottom-color'],
+    'border-left' : ['border-left-width', 'border-left-style', 'border-left-color'],
+    'border-image' : ['border-image-outset', 'border-image-repeat','border-image-slice', 'border-image-source', 'border-image-width'],
     'border-radius' : ["border-top-left-radius", "border-top-right-radius", "border-bottom-right-radius",
                        "border-bottom-left-radius"],
     'font' : ["font-family", "font-size", "font-style", "font-variant", "font-weight", "line-height"],