diff options
| author | John Mayhew | 2012-05-15 10:42:41 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-15 10:42:41 -0700 |
| commit | 035c851a955952d0a1c89a7c8a646b674ab3f4f2 (patch) | |
| tree | c1197e37c93fc56f28b36139c86559a3c49b5bdb /js | |
| parent | 52f63541065ce94fab8766b1b0db057eafcfccaa (diff) | |
| download | ninja-035c851a955952d0a1c89a7c8a646b674ab3f4f2.tar.gz | |
-fixed spacing problem in the tag tool
-implemented the new mode radio buttons for the pen tool
Diffstat (limited to 'js')
3 files changed, 13 insertions, 9 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.css b/js/components/tools-properties/pen-properties.reel/pen-properties.css index c6e68195..7f1b0f7f 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.css +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.css | |||
| @@ -4,9 +4,3 @@ | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | .optionsPenTool { | ||
| 8 | } | ||
| 9 | |||
| 10 | .optionsPenTool > * { | ||
| 11 | float:left; | ||
| 12 | } | ||
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 324d1070..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,18 +28,28 @@ | |||
| 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 | |||
| 31 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | 36 | "_fillColorCtrl": {"#": "fillColorCtrl"}, |
| 32 | "_strokeColorCtrl": {"#": "strokeColorCtrl"}, | 37 | "_strokeColorCtrl": {"#": "strokeColorCtrl"}, |
| 33 | "_strokeSize": {"@": "strokeSizeHT"} | 38 | "_strokeSize": {"@": "strokeSizeHT"} |
| 34 | } | 39 | } |
| 35 | } | 40 | } |
| 36 | } | 41 | } |
| 37 | </script> | 42 | </script> |
| 38 | 43 | ||
| 39 | </head> | 44 | </head> |
| 40 | 45 | ||
| 41 | <body> | 46 | <body> |
| 42 | <div data-montage-id="penProperties" class="subToolHolderPanel optionsPenTool"> | 47 | <div data-montage-id="penProperties" class="subToolHolderPanel toolOptionsFloatChildren optionsPenTool"> |
| 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 | |||
| 43 | <div class="toolColorChipIcon PencilTool"></div> | 53 | <div class="toolColorChipIcon PencilTool"></div> |
| 44 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> | 54 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> |
| 45 | <div class="toolColorChipIcon FillTool"></div> | 55 | <div class="toolColorChipIcon FillTool"></div> |
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 7a8f6d87..87f87aff 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | <input type="radio" data-montage-id="canvasTool" class="toolOptsRadioButton canvasTool" title="Canvas Element" name="TagRadios" value="canvas"/> | 45 | <input type="radio" data-montage-id="canvasTool" class="toolOptsRadioButton canvasTool" title="Canvas Element" name="TagRadios" value="canvas"/> |
| 46 | <input type="radio" data-montage-id="customTool" class="toolOptsRadioButton customTool" title="Custom Element" name="TagRadios" value="custom"/> | 46 | <input type="radio" data-montage-id="customTool" class="toolOptsRadioButton customTool" title="Custom Element" name="TagRadios" value="custom"/> |
| 47 | 47 | ||
| 48 | <div class="nj-divider divider-vertical"> </div> | 48 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
| 49 | 49 | ||
| 50 | <div class="toolColorChipIcon FillTool"></div> | 50 | <div class="toolColorChipIcon FillTool"></div> |
| 51 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 51 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> |