diff options
author | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
commit | e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch) | |
tree | e84d2dc5033c1b5c1b993662660a90af12584b69 /js/panels/Timeline/Style.reel/Style.html | |
parent | ba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.html')
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 12 |
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">[ ]</div> | 81 | <div data-montage-id="value-editor-color">[ ]</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> |