32 files changed, 1864 insertions, 2 deletions

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 251e86e4..1561f973 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -61,6 +61,13 @@
                     "element": {"#": "panel_5"}
                 }
             },
+            "panel_6": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                "element": {"#": "panel_6"}
+                }
+            },
 
             "owner": {
                 "module": "js/panels/PanelContainer.reel",
@@ -74,7 +81,8 @@
                     "panel_2":          {"@": "panel_2"},
                     "panel_3":          {"@": "panel_3"},
                     "panel_4":          {"@": "panel_4"},
-                    "panel_5":          {"@": "panel_5"}
+                    "panel_5":          {"@": "panel_5"},
+                    "panel_6":          {"@": "panel_6"}
                 },
                 "listeners": [
                     {
@@ -104,6 +112,7 @@
             <article data-montage-id="panel_3"></article>
             <article data-montage-id="panel_4"></article>
             <article data-montage-id="panel_5"></article>
+            <article data-montage-id="panel_6"></article>
                 </article>
     </section>
 </body>
diff --git a/js/panels/css-panel/css-panel-container.js b/js/panels/css-panel/css-panel-container.js
new file mode 100644
index 00000000..6110c999
--- /dev/null
+++ b/js/panels/css-panel/css-panel-container.js
@@ -0,0 +1,15 @@
+/* <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 PanelBase = require("js/panels/PanelBase").PanelBase;
+var Content = require("js/panels/css-panel/css-panel.reel").CSSPanelNew;
+
+exports.CSSPanelContainer = Montage.create(PanelBase, {
+    panelName : { value: "CSS Panel" },
+    minHeight : { value: 200 },
+    content : { value: Content }
+});
\ No newline at end of file
diff --git a/js/panels/css-panel/css-panel.reel/css-panel.css b/js/panels/css-panel/css-panel.reel/css-panel.css
new file mode 100644
index 00000000..6d296a8e
--- /dev/null
+++ b/js/panels/css-panel/css-panel.reel/css-panel.css
@@ -0,0 +1,49 @@
+/* <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> */
+.css-panel {
+    color: #FFF;
+    display: -webkit-box;
+    height: 100%;
+    -webkit-box-orient: vertical;
+}
+.css-panel > h3 {
+    background-color: #333;
+    border-top: 1px solid #3D3D3D;
+    color: #FFF;
+    cursor: default;
+    font-size: 12px;
+    font-weight: normal;
+    height: 16px;
+    margin: 0;
+    padding: 4px 0 2px 10px;
+    vertical-align: top;
+    -webkit-box-flex: 0;
+    -webkit-user-select: none;
+}
+.css-panel .style-sheets-view-container {
+    -webkit-box-flex: 0;
+    min-height: 41px;
+}
+.css-panel .styles-view-container {
+    -webkit-box-flex: 1;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+}
+.panel-message {
+    background-color: rgba(255,255,255, 0.1);
+    border: 1px dashed rgba(255,255,255, 0.2);
+    border-radius: 4px;
+    color: #CCC;
+    font-size: 11px;
+    font-weight: normal;
+    margin: 0 8px;
+    padding: 5px;
+    position: relative;
+    text-shadow: 1px 1px 0px #333;
+    text-align: center;
+    top: 8px;
+    -webkit-box-flex: 0;
+}
diff --git a/js/panels/css-panel/css-panel.reel/css-panel.html b/js/panels/css-panel/css-panel.reel/css-panel.html
new file mode 100644
index 00000000..61ec82bf
--- /dev/null
+++ b/js/panels/css-panel/css-panel.reel/css-panel.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- <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> -->
+<html lang="en">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" href="css-panel.css" type="text/css">
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "module" : "js/panels/css-panel/css-panel.reel",