20 files changed, 740 insertions, 69 deletions

diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
index 003724bb..54320eef 100755
--- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
@@ -16,6 +16,7 @@ var ComponentsPanel = require("js/panels/Components/ComponentsPanel").Components
 var ProjectPanel    = require("js/panels/Project/ProjectPanel").ProjectPanel;
 var MaterialsPanel  = require("js/panels/Materials/MaterialsPanel").MaterialsPanel;
 var PresetsPanel    = require("js/panels/presets/presets-panel").PresetsPanel;
+var CSSPanelNew    = require("js/panels/css-panel/css-panel-container").CSSPanelContainer;
 
 exports.PanelContainer = Montage.create(Component, {
     lastOffset: {
@@ -45,7 +46,7 @@ exports.PanelContainer = Montage.create(Component, {
     },
 
     initPanelOrder: {
-        value: ['ColorPanel', 'PropertiesPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel']
+        value: ['CSSPanelNew','PropertiesPanel','ColorPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel']
     },
 
     panelOrder: {
@@ -106,6 +107,7 @@ exports.PanelContainer = Montage.create(Component, {
             this.addEventListener("change@appModel.CSSPanel", this, false);
             this.addEventListener("change@appModel.MaterialsPanel", this, false);
             this.addEventListener("change@appModel.PresetsPanel", this, false);
+            this.addEventListener("change@appModel.CSSPanelNew", this, false);
         }
     },
 
diff --git a/js/panels/css-panel/css-panel-container.js b/js/panels/css-panel/css-panel-container.js
index aeaa2d13..6110c999 100644
--- a/js/panels/css-panel/css-panel-container.js
+++ b/js/panels/css-panel/css-panel-container.js
@@ -9,7 +9,7 @@ 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: "CSSPanelNew" },
+    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
index e69de29b..6d296a8e 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.css
+++ 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
index 86bfbbb7..899c7786 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.html
+++ b/js/panels/css-panel/css-panel.reel/css-panel.html
@@ -14,7 +14,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "module" : "js/panels/css-panel/css-panel.reel",
                 "name" : "CSSPanel",
                 "properties" : {
-                    "element" : {"#" : "container"}
+                    "element" : {"#" : "container"},
+                    "controller": {"@": "cssPanelController"}
                 }
             },
             "styleSheetView": {
@@ -36,9 +37,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </head>
 <body>
 <section id="container" class="css-panel">
-    <h2>Style Sheets</h2>
+    <h3>Style Sheets</h3>
     <div id="style-sheet-view"></div>
-    <h2>Styles</h2>
+    <h3>Styles</h3>
     <div id="styles-view-container"></div>
 </section>
 </body>
diff --git a/js/panels/css-panel/css-panel.reel/css-panel.js b/js/panels/css-panel/css-panel.reel/css-panel.js
index a593f1c4..228e91f6 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.js
+++ b/js/panels/css-panel/css-panel.reel/css-panel.js
@@ -8,16 +8,9 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.CSSPanelNew = Montage.create(Component, {
-    hasTemplate: {
-        value: true
-    },
-    condition: {
-        value: false
-    },
     templateDidLoad : {
         value: function() {
             console.log("css panel : template did load");
-            //this.condition = true;
         }
     },
     prepareForDraw : {
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css
new file mode 100644
index 00000000..0441c1cf
--- /dev/null
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css
@@ -0,0 +1,5 @@
+/* <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> */
\ No newline at end of file
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
new file mode 100644
index 00000000..e8661bf9
--- /dev/null
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
@@ -0,0 +1,57 @@
+<!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 href="css-style-rule.css" rel="stylesheet" type="text/css">
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "module" : "js/panels/css-panel/rule-components/css-style-rule.reel",
+                "name" : "CssStyleRule",
+                "properties" : {
+                    "element" : {"#" : "rule-item"}
+                }
+            },
+            "sheetName": {