36 files changed, 3492 insertions, 16 deletions

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
index 2a3fc068..4c0a3611 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
@@ -4,8 +4,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var cssPropertyNameList      = require("js/panels/CSSPanel/css-property-name-list").cssPropertyNameList,
-    cssCompletionMap         = require("js/panels/CSSPanel/css-value-completion-map").cssValueCompletionMap,
+var cssPropertyNameList      = require("js/panels/CSSPanel/css-property-name-list").CssPropertyNameList,
+    cssCompletionMap         = require("js/panels/CSSPanel/css-value-completion-map").CssValueCompletionMap,
     CSS_SHORTHAND_MAP        = require("js/panels/CSSPanel/css-shorthand-map").CSS_SHORTHAND_MAP,
     keyboardModule           = require("js/mediators/keyboard-mediator").Keyboard,
     nj                       = require("js/lib/NJUtils").NJUtils;
@@ -822,17 +822,14 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
     },
     getAllRelatedRules : {
         value: function(element) {
-            var pseudos = [null],//, 'link', 'visited', 'active', 'hover', 'focus', 'first-letter', 
-                            //'first-line', 'first-child', 'before', 'after', 'lang'],
-                rules = [],
+            var rules = [],
+                win = element.ownerDocument.defaultView,
                 self = this;
 
-            pseudos.forEach(function(pseudo) {
-                rules = rules.concat(nj.toArray(this.getMatchedCSSRules(element, ':'+pseudo)).filter(function(rule) {
-                    var sheetId = (rule.parentStyleSheet) ? rule.parentStyleSheet.ownerNode.id : null;
-                    return sheetId !== self._stageStyleSheetId;
-                }));
-            }, element.ownerDocument.defaultView);
+            rules = rules.concat(nj.toArray(win.getMatchedCSSRules(element)).filter(function(rule) {
+                var sheetId = (rule.parentStyleSheet) ? rule.parentStyleSheet.ownerNode.id : null;
+                return sheetId !== self._stageStyleSheetId;
+            }));
 
             return rules;
         }
diff --git a/js/panels/CSSPanel/css-property-name-list.js b/js/panels/CSSPanel/css-property-name-list.js
index 24a69c09..6d02b755 100755
--- a/js/panels/CSSPanel/css-property-name-list.js
+++ b/js/panels/CSSPanel/css-property-name-list.js
@@ -4,7 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-exports.cssPropertyNameList = [
+exports.CssPropertyNameList = [
     '-webkit-',
     "-webkit-animation",
     "-webkit-animation-delay",
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js
index bc43ebc4..191dbae5 100755
--- a/js/panels/CSSPanel/css-shorthand-map.js
+++ b/js/panels/CSSPanel/css-shorthand-map.js
@@ -52,7 +52,6 @@ exports.CSS_SHORTHAND_MAP = {
     'font-style' : ['font'],
     'font-family' : ['font'],
     'font-size' : ['font'],
-    'font-style' : ['font'],
     'font-variant' : ['font'],
     'font-weight' : ['font'],
     
@@ -74,4 +73,21 @@ exports.CSS_SHORTHAND_MAP = {
     '-webkit-transition-duration' : ['-webkit-transition'],
     '-webkit-transition-timing-function' : ['-webkit-transition'],
     '-webkit-transition-delay' : ['-webkit-transition']
+};
+
+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-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"],
+    'list' : ["list-style-type", "list-style-image", "list-style-position"],
+    'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"],
+    'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"],
+    '-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration",
+                            "-webkit-transition-timing-function", "-webkit-transition-delay"]
 };
\ No newline at end of file
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index e5cbbe32..900930d9 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -54,11 +54,18 @@
                     "element": {"#": "panel_5"}
                 }
             },
-
             "panel_6": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                "element": {"#": "panel_6"}
+                }
+            },
+
+            "panel_7": {
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
-                    "element": {"#": "panel_6"}
+                    "element": {"#": "panel_7"}
                 }
             },
 
@@ -74,7 +81,8 @@
                     "panel_3":          {"@": "panel_3"},
                     "panel_4":          {"@": "panel_4"},
                     "panel_5":          {"@": "panel_5"},
-                    "panel_6":          {"@": "panel_6"}
+                    "panel_6":          {"@": "panel_6"},
+                    "panel_7":          {"@": "panel_7"}
                 },
                 "listeners": [
                     {
@@ -105,6 +113,7 @@
             <article data-montage-id="panel_4"></article>
             <article data-montage-id="panel_5"></article>
             <article data-montage-id="panel_6"></article>
+            <article data-montage-id="panel_7"></article>
                 </article>
     </section>
 </body>
diff --git a/js/panels/collapse-composer.js b/js/panels/collapse-composer.js
new file mode 100644
index 00000000..0bd916c8
--- /dev/null
+++ b/js/panels/collapse-composer.js
@@ -0,0 +1,137 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+var Montage = require("montage/core/core").Montage;
+var Composer = require("montage/ui/compo