diff options
| author | John Mayhew | 2012-05-03 15:11:56 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-03 15:11:56 -0700 |
| commit | 1a759361b82127f9d5c1428dc889fffdf2daaf86 (patch) | |
| tree | 92e62aa215418d864e5224797a974cb9841d4b90 /js/components/tools-properties/pen-properties.reel/pen-properties.html | |
| parent | 6b1a6994d98a18b45016b97ac8d81483109a586c (diff) | |
| download | ninja-1a759361b82127f9d5c1428dc889fffdf2daaf86.tar.gz | |
First round of moving color chips into the sub tools. Shape and Pen tool now have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
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 | 16 |
1 files changed, 10 insertions, 6 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 e835f69d..176663df 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
| @@ -28,20 +28,24 @@ | |||
| 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 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | ||
| 32 | "_strokeColorCtrl": {"#": "strokeColorCtrl"}, | ||
| 31 | "_strokeSize": {"@": "strokeSizeHT"} | 33 | "_strokeSize": {"@": "strokeSizeHT"} |
| 32 | } | 34 | } |
| 33 | } | 35 | } |
| 34 | } | 36 | } |
| 35 | </script> | 37 | </script> |
| 36 | 38 | ||
| 37 | </head> | 39 | </head> |
| 38 | 40 | ||
| 39 | <body> | 41 | <body> |
| 40 | <div data-montage-id="penProperties" class="subToolHolderPanel"> | 42 | <div data-montage-id="penProperties" class="subToolHolderPanel optionsPenTool"> |
| 41 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 43 | <div class="colorCtrlIcon FillTool"></div> |
| 42 | <label class="label"> Stroke:</label> | 44 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> |
| 43 | <div id="strokeSize" class="label"></div> | 45 | <div class="colorCtrlIcon PencilTool"></div> |
| 44 | </div> | 46 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> |
| 47 | <label class="label"> Stroke:</label> | ||
| 48 | <div id="strokeSize" class="label"></div> | ||
| 45 | </div> | 49 | </div> |
| 46 | </body> | 50 | </body> |
| 47 | 51 | ||