aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/Style.html
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 14:27:51 -0700
committerKruti Shah2012-05-31 14:27:51 -0700
commit82b0c1b8ee197e23fbd5184cbb0522ca76e651c8 (patch)
tree1efad1d6b5c7e82ca1adcf2f18e8aa12931206ec /js/panels/Timeline/Style.reel/Style.html
parentc350cc1c060fdf17357ddadce024267943784593 (diff)
downloadninja-82b0c1b8ee197e23fbd5184cbb0522ca76e651c8.tar.gz
Color Chip
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.html')
-rw-r--r--js/panels/Timeline/Style.reel/Style.html7
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 @@
19 "styleProperty" : {"#": "container-property"}, 19 "styleProperty" : {"#": "container-property"},
20 "valueEditorHottext" : {"@":"hottextunit"}, 20 "valueEditorHottext" : {"@":"hottextunit"},
21 "dtextProperty" : {"@":"dtext1"}, 21 "dtextProperty" : {"@":"dtext1"},
22 "myHintable" : {"@" :"hintable"} 22 "myHintable" : {"@" :"hintable"},
23 "_fillColorCtrl": {"#": "fillColorCtrl"}
23 } 24 }
24 }, 25 },
25 "dtext1" : { 26 "dtext1" : {
@@ -78,7 +79,9 @@
78 <div data-montage-id="value-editor-hottext"></div> 79 <div data-montage-id="value-editor-hottext"></div>
79 </div> 80 </div>
80 <div class="cell-value value-editor editor-color hidden"> 81 <div class="cell-value value-editor editor-color hidden">
81 <div data-montage-id="value-editor-color">[&nbsp;]</div> 82 <div data-montage-id="value-editor-color">
83 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
84 </div>
82 </div> 85 </div>
83 <div class="cell-value value-editor editor-input hidden"> 86 <div class="cell-value value-editor editor-input hidden">
84 <!-- <div data-montage-id="value-editor-input"></div> --> 87 <!-- <div data-montage-id="value-editor-input"></div> -->