aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/Style.html
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /js/panels/Timeline/Style.reel/Style.html
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
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>