diff options
author | John Mayhew | 2012-05-10 11:17:42 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-10 11:17:42 -0700 |
commit | 3be15e2076f2d3d46862bbc0ea078b9bf2e161fe (patch) | |
tree | 7043c476e0852197f67f00b1d1c583736d492797 /js/components/tools-properties/shape-properties.reel/shape-properties.html | |
parent | 18370abcf406c6ab36d5c5f2613cb79e756ff6d2 (diff) | |
download | ninja-3be15e2076f2d3d46862bbc0ea078b9bf2e161fe.tar.gz |
-moved sel tool images to proper folder
-finished styling shape tool options
-added new icons for shape tool
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 | 10 |
1 files changed, 5 insertions, 5 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 c6aa0c94..9b523a3f 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html | |||
@@ -118,6 +118,8 @@ | |||
118 | "rectProperties": {"@": "rectProperties1"}, | 118 | "rectProperties": {"@": "rectProperties1"}, |
119 | "lineProperties": {"@": "lineProperties1"}, | 119 | "lineProperties": {"@": "lineProperties1"}, |
120 | 120 | ||
121 | "endDivider": {"#": "endDivider"}, | ||
122 | |||
121 | "components": [ | 123 | "components": [ |
122 | {"@": "repetition1"} | 124 | {"@": "repetition1"} |
123 | ] | 125 | ] |
@@ -144,14 +146,14 @@ | |||
144 | <div class="nj-divider divider-vertical"> </div> | 146 | <div class="nj-divider divider-vertical"> </div> |
145 | <label class="label">Stroke:</label> | 147 | <label class="label">Stroke:</label> |
146 | <div data-montage-id="strokeControl" class="label"></div> | 148 | <div data-montage-id="strokeControl" class="label"></div> |
149 | <div class="nj-divider divider-vertical"> </div> | ||
147 | <div id="customProperties" class="shapeCustomProps"> | 150 | <div id="customProperties" class="shapeCustomProps"> |
148 | <div data-montage-id="ovalProperties" class="label"></div> | 151 | <div data-montage-id="ovalProperties" class="label"></div> |
149 | <div data-montage-id="rectProperties" class="label"></div> | 152 | <div data-montage-id="rectProperties" class="label"></div> |
150 | <div data-montage-id="lineProperties" class="label"></div> | 153 | <div data-montage-id="lineProperties" class="label"></div> |
151 | </div> | 154 | </div> |
152 | 155 | <div data-montage-id="endDivider" class="nj-divider divider-vertical toolOptionsSpacer"> </div> | |
153 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> | 156 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> |
154 | |||
155 | <label data-montage-id="materialLabel" class="label">Material:</label> | 157 | <label data-montage-id="materialLabel" class="label">Material:</label> |
156 | <div data-montage-id="strokeIcon" class="toolColorChipIcon PencilTool"></div> | 158 | <div data-montage-id="strokeIcon" class="toolColorChipIcon PencilTool"></div> |
157 | 159 | ||
@@ -160,9 +162,7 @@ | |||
160 | 162 | ||
161 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> | 163 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> |
162 | <select class="selectBox" data-montage-id="fillMaterialCB"> | 164 | <select class="selectBox" data-montage-id="fillMaterialCB"> |
163 | </select> | 165 | </select> |
164 | |||
165 | |||
166 | </div> | 166 | </div> |
167 | </body> | 167 | </body> |
168 | 168 | ||