Merge pull request #316 from imix23ways/Timeline-merge-candidate

Timeline merge candidate

1 files changed, 5 insertions, 2 deletions

diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index 5be159c3..cdc355e7 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -19,7 +19,8 @@
                         "styleProperty" : {"#": "container-property"},
                         "valueEditorHottext" : {"@":"hottextunit"},
                         "dtextProperty" : {"@":"dtext1"},
-                        "myHintable" : {"@" :"hintable"}
+                        "myHintable" : {"@" :"hintable"},
+                        "_fillColorCtrl": {"#": "fillColorCtrl"}
                     }
                 },
                     "dtext1" : {
@@ -78,7 +79,9 @@
                                                 <div data-montage-id="value-editor-hottext"></div>
                                         </div>
                                         <div class="cell-value value-editor editor-color hidden">
-                                                <div data-montage-id="value-editor-color">[&nbsp;]</div>
+                                                <div data-montage-id="value-editor-color">
+                            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+                                                </div>
                                         </div>
                                         <div class="cell-value value-editor editor-input hidden">
                                                 <!-- <div data-montage-id="value-editor-input"></div> -->