aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html')
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html32
1 files changed, 18 insertions, 14 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 010e77b2..3ac0b261 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -136,6 +136,8 @@
136 "properties": { 136 "properties": {
137 "element": {"#": "inkBottleProperties"}, 137 "element": {"#": "inkBottleProperties"},
138 138
139 "_strokeColorCtrl": {"#": "strokeColorCtrl"},
140
139 "useBorderWidth": {"@": "borderWidthCh"}, 141 "useBorderWidth": {"@": "borderWidthCh"},
140 "borderWidthLabel": {"@": "borderWidthLabel"}, 142 "borderWidthLabel": {"@": "borderWidthLabel"},
141 "_borderWidth": {"@": "borderWidthHT"}, 143 "_borderWidth": {"@": "borderWidthHT"},
@@ -154,14 +156,17 @@
154 } 156 }
155 } 157 }
156 } 158 }
157 </script> 159 </script>
158 160
159 </head> 161 </head>
160 162
161 <body> 163 <body>
162 <div data-montage-id="inkBottleProperties" class="subToolHolderPanel inkBottleProperties"> 164 <div data-montage-id="inkBottleProperties" class="subToolHolderPanel inkBottleOptions toolOptionsFloatChildren">
165 <div data-montage-id="elementInkOptions" class="toolOptionsFloatChildren">
166 <div class="toolColorChipIcon PencilTool"></div>
167 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
168 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
163 169
164 <div data-montage-id="elementInkOptions" class="leftLabel" style="padding-top: 3px;">
165 <input data-montage-id="useBorderWidthCh" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/> 170 <input data-montage-id="useBorderWidthCh" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/>
166 <label data-montage-id="borderWidthLabel" class="label"> Border:</label> 171 <label data-montage-id="borderWidthLabel" class="label"> Border:</label>
167 <div data-montage-id="borderWidth" class="label"></div> 172 <div data-montage-id="borderWidth" class="label"></div>
@@ -181,25 +186,24 @@
181 </select> 186 </select>
182 </div> 187 </div>
183 188
184 <div class="nj-divider divider-vertical" style="margin:8px 20px; float: left;">&nbsp;</div> 189 <div class="toolOptionsSpacer">&nbsp;</div>
190 <div class="nj-divider divider-vertical">&nbsp;</div>
191 <div class="toolOptionsSpacer">&nbsp;</div>
185 192
186 <div data-montage-id="shapeInkOptions" class="leftLabel" style="margin-top: 5px;"> 193 <div data-montage-id="shapeInkOptions" class="toolOptionsFloatChildren">
187 <input data-montage-id="useStrokeSizeCh" type="checkbox" name="useStrokeControl" class="nj-skinned" title="Apply stroke size"/> 194 <input data-montage-id="useStrokeSizeCh" type="checkbox" name="useStrokeControl" class="nj-skinned" title="Apply stroke size"/>
188 <label data-montage-id="strokeSizeLabel" class="label"> Stroke:</label> 195 <label data-montage-id="strokeSizeLabel" class="label"> Stroke:</label>
189 <div data-montage-id="strokeSize" class="label"></div> 196 <div data-montage-id="strokeSize" class="label"></div>
190 </div> 197 </div>
191 198
192 <div data-montage-id="webGLInkOptions" class="leftLabel"> 199 <div data-montage-id="webGLInkOptions" class="toolOptionsFloatChildren">
193 <label class="label"> 200 <input data-montage-id="useWebGLCHIB" type="checkbox" name="useWebGLControl" class="nj-skinned"/>
194 <input data-montage-id="useWebGLCHIB" type="checkbox" name="useWebGLControl" class="nj-skinned"/> 201 <label class="label"> Use WebGL</label>
195 <label class="label"> Use WebGL</label>
196 </label>
197 202
198 <div data-montage-id="materialsContainerIB" class="leftLabel"> 203 <div data-montage-id="materialsContainerIB" class="toolOptionsFloatChildren">
199 <label class="label"> Materials:</label> 204 <label class="label"> Materials:</label>
200 <div data-montage-id="strokeIconIB" class="pencilToolUp" style="float: left; margin: 0 2px 0 5px;"></div> 205 <div data-montage-id="strokeIconIB" class="toolColorChipIcon PencilTool"></div>
201 <select data-montage-id="strokeMaterialIBCB" class="nj-skinned"> 206 <select data-montage-id="strokeMaterialIBCB" class="nj-skinned"></select>
202 </select>
203 </div> 207 </div>
204 </div> 208 </div>
205 </div> 209 </div>