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/shape-properties.reel/shape-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/shape-properties.reel/shape-properties.html')
| -rwxr-xr-x | js/components/tools-properties/shape-properties.reel/shape-properties.html | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index 117664a3..d3faab75 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | } | 36 | } |
| 37 | }, | 37 | }, |
| 38 | 38 | ||
| 39 | |||
| 39 | "_strokeSize1": { | 40 | "_strokeSize1": { |
| 40 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 41 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 41 | "properties": { | 42 | "properties": { |
| @@ -108,6 +109,10 @@ | |||
| 108 | "_materialLabel": {"#": "materialLabel"}, | 109 | "_materialLabel": {"#": "materialLabel"}, |
| 109 | "_strokeIcon": {"#": "strokeIcon"}, | 110 | "_strokeIcon": {"#": "strokeIcon"}, |
| 110 | 111 | ||
| 112 | "_fillColorCtrlIcon": {"#": "fillColorCtrlIcon"}, | ||
| 113 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | ||
| 114 | "_strokeColorCtrl": {"#": "strokeColorCtrl"}, | ||
| 115 | |||
| 111 | "_strokeSize": {"@": "_strokeSize1"}, | 116 | "_strokeSize": {"@": "_strokeSize1"}, |
| 112 | "ovalProperties": {"@": "ovalProperties1"}, | 117 | "ovalProperties": {"@": "ovalProperties1"}, |
| 113 | "rectProperties": {"@": "rectProperties1"}, | 118 | "rectProperties": {"@": "rectProperties1"}, |
| @@ -121,20 +126,23 @@ | |||
| 121 | 126 | ||
| 122 | } | 127 | } |
| 123 | } | 128 | } |
| 124 | </script> | 129 | </script> |
| 125 | 130 | ||
| 126 | 131 | ||
| 127 | </head> | 132 | </head> |
| 128 | 133 | ||
| 129 | <body> | 134 | <body> |
| 130 | <div id="shapeProperties" class="subToolHolderPanel"> | 135 | <div id="shapeProperties" class="subToolHolderPanel optionsShapeTool"> |
| 131 | <div id="shapeToolsList"> | 136 | <div id="shapeToolsList"> |
| 132 | <div id="toolbutton"></div> | 137 | <div id="toolbutton"></div> |
| 133 | </div> | 138 | </div> |
| 139 | <div data-montage-id="fillColorCtrlIcon" class="colorCtrlIcon FillTool"></div> | ||
| 140 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> | ||
| 141 | <div class="colorCtrlIcon PencilTool"></div> | ||
| 142 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> | ||
| 134 | 143 | ||
| 135 | <label class="label">Stroke:</label> | 144 | <label class="label">Stroke:</label> |
| 136 | <div id="strokeControl" class="label"></div> | 145 | <div id="strokeControl" class="label"></div> |
| 137 | |||
| 138 | <div id="customProperties"> | 146 | <div id="customProperties"> |
| 139 | <div id="ovalProperties" class="label"></div> | 147 | <div id="ovalProperties" class="label"></div> |
| 140 | <div id="rectProperties" class="label"></div> | 148 | <div id="rectProperties" class="label"></div> |