8 files changed, 68 insertions, 58 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index f6977a00..c5076771 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -821,7 +821,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// method to apply/test the new value
             dec.setProperty(property, value, priority);
 
-            if(rule.parentStyleSheet) {
+            if(rule.type !== 'inline' && rule.parentStyleSheet) {
                 this.styleSheetModified(rule.parentStyleSheet);
             }
 
@@ -1289,6 +1289,27 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             return sheet;
         }
     },
+
+    ///// Remove Style sheet
+    ///// Removes style sheet from document
+
+    removeStyleSheet : {
+        value: function(sheet) {
+            var sheetEl = sheet.ownerNode;
+
+            if(sheetEl) {
+                sheetEl.disabled = true;
+                this.userStyleSheets.splice(this.userStyleSheets.indexOf(sheet), 1);
+
+                ///// Mark for removal for i/o
+                sheetEl.setAttribute('data-ninja-remove', 'true');
+
+                NJevent('removeStyleSheet', sheet);
+            }
+
+
+        }
+    },
     
     ///// Gets the stylesheet object associated with passed-in
     ///// element or element id, with option context (document)
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 5bc5c87d..54bb1fae 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.html
+++ b/js/panels/css-panel/css-panel.reel/css-panel.html
@@ -15,7 +15,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "name" : "CSSPanelNew",
                 "properties" : {
                     "element" : {"#" : "container"},
-                    "styleSheetsView": {"@": "styleSheetsView"}
+                    "styleSheetsView": {"@": "styleSheetsView"},
+                    "stylesViewContainer": {"@": "stylesViewContainer"}
                 }
             },
 
diff --git a/js/panels/css-panel/css-style.reel/css-style.js b/js/panels/css-panel/css-style.reel/css-style.js
index 3a07f8f1..1787665f 100644
--- a/js/panels/css-panel/css-style.reel/css-style.js
+++ b/js/panels/css-panel/css-style.reel/css-style.js
@@ -143,17 +143,8 @@ exports.CssStyle = Montage.create(Component, {
 
     getRule : {
         value: function() {
-            //var declarationComponent = this.treeView.parentComponent,
-            var declarationComponent = this.parentComponent.parentComponent.parentComponent,
-                rule;
-
-            if(declarationComponent.type === 'inline') {
-                rule = { style : declarationComponent.declaration }
-            } else {
-                rule = this.parentComponent.parentComponent.parentComponent.declaration.parentRule;
-            }
-
-            return rule;
+            var declarationComponent = this.parentComponent.parentComponent.parentComponent
+            return declarationComponent.rule;
         }
     },
 
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html
index ca24487d..788cafcc 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.html
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -20,7 +20,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                     "editButton": {"@": "editButton"},
                     "editView": {"#": "style-sheet-edit"},
                     "disableButton": {"@": "disableButton"},
-                    "importButton": {"@": "importButton"},
                     "deleteButton": {"@": "deleteButton"}
                 }
             },
@@ -75,20 +74,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }]
 
             },
-            "importButton": {
-                "module": "montage/ui/button.reel",
-                "name": "Button",
-                "properties": {
-                    "element": {"#": "import-button"},
-                    "identifier": "importButton",
-                    "label": "Import"
-                },
-                "listeners": [{
-                    "type": "action",
-                    "listener": {"@": "owner"}
-                }]
-
-            },
             "deleteButton": {
                 "module": "montage/ui/button.reel",
                 "name": "Button",
@@ -118,7 +103,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
         <button data-montage-id="edit-button" class="ss-edit-button"></button>
         <button data-montage-id="delete-button" class="ss-delete-button nj-skinned"></button>
-        <button data-montage-id="import-button" class="ss-import-button nj-skinned"></button>
         <button data-montage-id="disable-button" class="ss-disable-button nj-skinned"></button>
 
     </div>
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.js b/js/panels/css-panel/style-sheet.reel/style-sheet.js
index 0ff195d5..a3326275 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.js
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.js
@@ -11,6 +11,10 @@ exports.StyleSheet = Montage.create(Component, {
     _translateDistance: {
         value: null
     },
+    viewContainer : {
+        value: null,
+        serializable: true
+    },
 
     prepareForDraw : {
         value: function() {
@@ -43,14 +47,6 @@ exports.StyleSheet = Montage.create(Component, {
                 this.editView.style.removeProperty(transStr);
             }
 
-            if(this._readOnly) {
-                this._element.classList.add('ss-locked');
-                this.importButton.element.classList.remove('ss-invisible');
-            } else {
-                this._element.classList.remove('ss-locked');
-                this.importButton.element.classList.add('ss-invisible');
-            }
-
             if(this.default) {
                 this._element.classList.add('default-style-sheet');
             } else {
@@ -73,10 +69,7 @@ exports.StyleSheet = Montage.create(Component, {
             var nonBlurringElements = [
                 this.editView,
                 this.deleteButton.element,
-                this.disableButton.element,
-                this.importButton.element];
-
-            console.log("handle mousedown");
+                this.disableButton.element];
 
             if(nonBlurringElements.indexOf(e.target) === -1) {
                 this.editing = false;
@@ -112,7 +105,7 @@ exports.StyleSheet = Montage.create(Component, {
     handleDeleteButtonAction : {
         value: function(e) {
             e.stopPropagation();
-            debugger;
+            this.parentComponent.parentComponent.handleDeleteAction(this);
         }
     },
 
@@ -208,6 +201,8 @@ exports.StyleSheet = Montage.create(Component, {
             return this._source;
         },
         set: function(sheet) {
+            if(!sheet || sheet === this._source) { return; }
+
             console.log('sheet being set: ', this);
 
             this._extractData(sheet.ownerNode);
diff --git a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html
index 6e1638a6..bbefc69b 100644
--- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html
+++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html
@@ -11,16 +11,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
     <script type="text/montage-serialization">
         {
             "owner": {