aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/Style.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/Timeline/Style.reel/Style.html
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.html')
-rw-r--r--js/panels/Timeline/Style.reel/Style.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index 9fb098de..5be159c3 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -65,23 +65,23 @@
65 </script> 65 </script>
66 </head> 66 </head>
67 <body> 67 <body>
68 <div id="style-container"> 68 <div data-montage-id="style-container">
69 <div class="style-padding"> 69 <div class="style-padding">
70 <div class="row-hintable hidden"> 70 <div class="row-hintable hidden">
71 <div id="style-hintable"></div> 71 <div data-montage-id="style-hintable"></div>
72 </div> 72 </div>
73 <div class="container-propvals hidden"> 73 <div class="container-propvals hidden">
74 <div class="cell-property"> 74 <div class="cell-property">
75 <div id="container-property">property</div> 75 <div data-montage-id="container-property">property</div>
76 </div> 76 </div>
77 <div class="cell-value value-editor editor-hottext hidden"> 77 <div class="cell-value value-editor editor-hottext hidden">
78 <div id="value-editor-hottext"></div> 78 <div data-montage-id="value-editor-hottext"></div>
79 </div> 79 </div>
80 <div class="cell-value value-editor editor-color hidden"> 80 <div class="cell-value value-editor editor-color hidden">
81 <div id="value-editor-color">[&nbsp;]</div> 81 <div data-montage-id="value-editor-color">[&nbsp;]</div>
82 </div> 82 </div>
83 <div class="cell-value value-editor editor-input hidden"> 83 <div class="cell-value value-editor editor-input hidden">
84 <!-- <div id="value-editor-input"></div> --> 84 <!-- <div data-montage-id="value-editor-input"></div> -->
85 <input type="text" class="nj-skinned" value="" /> 85 <input type="text" class="nj-skinned" value="" />
86 </div> 86 </div>
87 </div> 87 </div>