diff options
| author | John Mayhew | 2012-05-07 14:30:47 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 14:30:47 -0700 |
| commit | 29ad6355ef60cfb3b3fc7f780504f3ed30845883 (patch) | |
| tree | bbe2dcd46c98db8138ad0a8f0263ef33324d7669 /js/components/tools-properties/tag-properties.reel/tag-properties.html | |
| parent | 1a759361b82127f9d5c1428dc889fffdf2daaf86 (diff) | |
| download | ninja-29ad6355ef60cfb3b3fc7f780504f3ed30845883.tar.gz | |
More implementation of moving color chips to the individual subtools.
Removed the tool color bar
Added new icons for inkbottle
Removed Pencil tool
Removed Inkbottle tool
Added chips to the pen, brush and tag tools
Aligned controls in several subtools
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel/tag-properties.html')
| -rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.html | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index c80ba36e..379c37a0 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html | |||
| @@ -17,7 +17,9 @@ | |||
| 17 | "properties": { | 17 | "properties": { |
| 18 | "element": {"#": "tagProperties"}, | 18 | "element": {"#": "tagProperties"}, |
| 19 | 19 | ||
| 20 | "divElement": {"#": "divTool"}, | 20 | "_fillColorCtrl": {"#": "fillColorCtrl"}, |
| 21 | |||
| 22 | "divElement": {"#": "divTool"}, | ||
| 21 | "imageElement": {"#": "imageTool"}, | 23 | "imageElement": {"#": "imageTool"}, |
| 22 | "videoElement": {"#": "videoTool"}, | 24 | "videoElement": {"#": "videoTool"}, |
| 23 | "canvasElement": {"#": "canvasTool"}, | 25 | "canvasElement": {"#": "canvasTool"}, |
| @@ -30,13 +32,17 @@ | |||
| 30 | } | 32 | } |
| 31 | } | 33 | } |
| 32 | } | 34 | } |
| 33 | </script> | 35 | </script> |
| 34 | 36 | ||
| 35 | </head> | 37 | </head> |
| 36 | 38 | ||
| 37 | <body> | 39 | <body> |
| 38 | <div id="tagProperties" class="subToolHolderPanel"> | 40 | <div id="tagProperties" class="subToolHolderPanel"> |
| 39 | <div id="tagToolContainer" class="tagRadioButtons"> | 41 | <div id="tagToolContainer" class="tagRadioButtons"> |
| 42 | <div class="leftLabel colorCtrlIcon FillTool"></div> | ||
| 43 | <div data-montage-id="fillColorCtrl" class="leftLabel fillColorCtrl"></div> | ||
| 44 | <div class="nj-divider divider-vertical"> </div> | ||
| 45 | |||
| 40 | <input type="radio" id="divTool" class="tag-type" title="Div Element" name="TagRadios" checked/> | 46 | <input type="radio" id="divTool" class="tag-type" title="Div Element" name="TagRadios" checked/> |
| 41 | <input type="radio" id="imageTool" class="tag-type" title="Image Element" name="TagRadios"/> | 47 | <input type="radio" id="imageTool" class="tag-type" title="Image Element" name="TagRadios"/> |
| 42 | <input type="radio" id="videoTool" class="tag-type" title="Video Element" name="TagRadios"/> | 48 | <input type="radio" id="videoTool" class="tag-type" title="Video Element" name="TagRadios"/> |