diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/tools-properties/pen-properties.reel/pen-properties.html | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-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/pen-properties.reel/pen-properties.html')
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index 68ab85f6..e720eb84 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
| @@ -28,21 +28,36 @@ | |||
| 28 | "prototype": "js/components/tools-properties/pen-properties.reel", | 28 | "prototype": "js/components/tools-properties/pen-properties.reel", |
| 29 | "properties": { | 29 | "properties": { |
| 30 | "element": {"#": "penProperties"}, | 30 | "element": {"#": "penProperties"}, |
| 31 | |||
| 32 | "_penToolRadio": {"#": "penTool"}, | ||
| 33 | "_penPlusRadio": {"#": "penPlus"}, | ||
| 34 | "_penMinusRadio": {"#": "penMinus"}, | ||
| 35 | |||
| 36 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | ||
| 37 | "_strokeColorCtrl": {"#": "strokeColorCtrl"}, | ||
| 31 | "_strokeSize": {"@": "strokeSizeHT"} | 38 | "_strokeSize": {"@": "strokeSizeHT"} |
| 32 | } | 39 | } |
| 33 | } | 40 | } |
| 34 | } | 41 | } |
| 35 | </script> | 42 | </script> |
| 36 | 43 | ||
| 37 | </head> | 44 | </head> |
| 38 | 45 | ||
| 39 | <body> | 46 | <body> |
| 40 | <div data-montage-id="penProperties" class="subToolHolderPanel"> | 47 | <div data-montage-id="penProperties" class="subToolHolderPanel toolOptionsFloatChildren optionsPenTool"> |
| 41 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 48 | <input type="radio" data-montage-id="penTool" class="toolOptsRadioButton penToolIcon" title="Pen Tool" name="penSubtoolRadios" value="pen" checked/> |
| 49 | <input type="radio" data-montage-id="penPlus" class="toolOptsRadioButton penPlusToolIcon" title="Pen Plus" name="penSubtoolRadios" value="penPlus"/> | ||
| 50 | <input type="radio" data-montage-id="penMinus" class="toolOptsRadioButton penMinusToolIcon toolOptionsSpacer" title="Pen Minus" name="penSubtoolRadios" value="penMinus"/> | ||
| 51 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | ||
| 52 | |||
| 53 | <div class="toolColorChipIcon PencilTool"></div> | ||
| 54 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> | ||
| 55 | <div class="toolColorChipIcon FillTool"></div> | ||
| 56 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | ||
| 57 | <div class="nj-divider divider-vertical"> </div> | ||
| 42 | <label class="label"> Stroke:</label> | 58 | <label class="label"> Stroke:</label> |
| 43 | <div data-montage-id="strokeSize" class="label"></div> | 59 | <div data-montage-id="strokeSize" class="label"></div> |
| 44 | </div> | 60 | </div> |
| 45 | </div> | ||
| 46 | </body> | 61 | </body> |
| 47 | 62 | ||
| 48 | </html> \ No newline at end of file | 63 | </html> \ No newline at end of file |