aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/style-shorthand.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/css-panel/style-shorthand.reel')
-rw-r--r--js/panels/css-panel/style-shorthand.reel/style-shorthand.css1
-rw-r--r--js/panels/css-panel/style-shorthand.reel/style-shorthand.html13
-rw-r--r--js/panels/css-panel/style-shorthand.reel/style-shorthand.js1
3 files changed, 11 insertions, 4 deletions
diff --git a/js/panels/css-panel/style-shorthand.reel/style-shorthand.css b/js/panels/css-panel/style-shorthand.reel/style-shorthand.css
index e746146a..d138dfef 100644
--- a/js/panels/css-panel/style-shorthand.reel/style-shorthand.css
+++ b/js/panels/css-panel/style-shorthand.reel/style-shorthand.css
@@ -14,6 +14,7 @@
14 padding-left: 20px; 14 padding-left: 20px;
15 margin-top: 0; 15 margin-top: 0;
16 margin-bottom: 0; 16 margin-bottom: 0;
17 overflow: hidden;
17} 18}
18.style-shorthand-branch > div { 19.style-shorthand-branch > div {
19 background-color: #fafafa; 20 background-color: #fafafa;
diff --git a/js/panels/css-panel/style-shorthand.reel/style-shorthand.html b/js/panels/css-panel/style-shorthand.reel/style-shorthand.html
index 63aa64f8..243d9cc7 100644
--- a/js/panels/css-panel/style-shorthand.reel/style-shorthand.html
+++ b/js/panels/css-panel/style-shorthand.reel/style-shorthand.html
@@ -17,13 +17,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
17 "element" : {"#" : "branch"}, 17 "element" : {"#" : "branch"},
18 "label" : { "@" : "textComponent" }, 18 "label" : { "@" : "textComponent" },
19 "branchList": {"#" : "branchList"}, 19 "branchList": {"#" : "branchList"},
20 "styleListDisclosure": {"#": "style-list-disclosure"},
21 "arrayController": {"@": "arrayController" }, 20 "arrayController": {"@": "arrayController" },
22 "repetition": {"@": "repetition"}, 21 "repetition": {"@": "repetition"},
23 "leafComponent": {"@": "leaf"}, 22 "leafComponent": {"@": "leaf"},
24 "branchComponent": {"@": "branch"}, 23 "branchComponent": {"@": "branch"},
25 "branchCollapser": {"#": "collapser"} 24 "branchCollapser": {"#": "collapser" }
26
27 } 25 }
28 }, 26 },
29 27
@@ -149,6 +147,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
149 "oneway": true 147 "oneway": true
150 } 148 }
151 } 149 }
150 },
151
152 "collapser" : {
153 "module": "js/panels/collapse-composer",
154 "name": "CollapseComposer",
155 "properties" : {
156 "element": {"#":"collapser"},
157 "component": {"@": "repetition"}
158 }
152 } 159 }
153 } 160 }
154 </script> 161 </script>
diff --git a/js/panels/css-panel/style-shorthand.reel/style-shorthand.js b/js/panels/css-panel/style-shorthand.reel/style-shorthand.js
index e64d64c7..028699a1 100644
--- a/js/panels/css-panel/style-shorthand.reel/style-shorthand.js
+++ b/js/panels/css-panel/style-shorthand.reel/style-shorthand.js
@@ -29,7 +29,6 @@ var styleShorthand = exports.StyleShorthand= Montage.create(TreeNode, {
29 this.arrayController.delegate = this.treeView.contentController; 29 this.arrayController.delegate = this.treeView.contentController;
30 30
31 this.branchCollapser.removeAttribute('id'); 31 this.branchCollapser.removeAttribute('id');
32 this.branchCollapser.addEventListener('click', this, false);
33 } 32 }
34 }, 33 },
35 willDraw : { 34 willDraw : {