diff options
author | Pushkar Joshi | 2012-05-21 08:40:40 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-21 08:40:40 -0700 |
commit | 11cfa9ef2871002b600f1c18f4e06e55a826163c (patch) | |
tree | 381b23b0fa86cdf283a0da7a1b7d532a94e89db4 /js/components/tools-properties/shape-properties.reel/shape-properties.html | |
parent | 4cb3612c9a67f4020d2949b5e5e5d84a90017974 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-11cfa9ef2871002b600f1c18f4e06e55a826163c.tar.gz |
Merge branch 'master' into pentool
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 | 33 |
1 files changed, 21 insertions, 12 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 6d58fe80..9b523a3f 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,11 +109,17 @@ | |||
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"}, |
114 | "lineProperties": {"@": "lineProperties1"}, | 119 | "lineProperties": {"@": "lineProperties1"}, |
115 | 120 | ||
121 | "endDivider": {"#": "endDivider"}, | ||
122 | |||
116 | "components": [ | 123 | "components": [ |
117 | {"@": "repetition1"} | 124 | {"@": "repetition1"} |
118 | ] | 125 | ] |
@@ -127,33 +134,35 @@ | |||
127 | </head> | 134 | </head> |
128 | 135 | ||
129 | <body> | 136 | <body> |
130 | <div data-montage-id="shapeProperties" class="subToolHolderPanel"> | 137 | <div data-montage-id="shapeProperties" class="subToolHolderPanel optionsShapeTool toolOptionsFloatChildren"> |
131 | <div data-montage-id="shapeToolsList"> | 138 | <div data-montage-id="shapeToolsList"> |
132 | <div data-montage-id="toolbutton"></div> | 139 | <div data-montage-id="toolbutton"></div> |
133 | </div> | 140 | </div> |
134 | 141 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | |
142 | <div class="toolColorChipIcon PencilTool"></div> | ||
143 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> | ||
144 | <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div> | ||
145 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | ||
146 | <div class="nj-divider divider-vertical"> </div> | ||
135 | <label class="label">Stroke:</label> | 147 | <label class="label">Stroke:</label> |
136 | <div data-montage-id="strokeControl" class="label"></div> | 148 | <div data-montage-id="strokeControl" class="label"></div> |
137 | 149 | <div class="nj-divider divider-vertical"> </div> | |
138 | <div id="customProperties"> | 150 | <div id="customProperties" class="shapeCustomProps"> |
139 | <div data-montage-id="ovalProperties" class="label"></div> | 151 | <div data-montage-id="ovalProperties" class="label"></div> |
140 | <div data-montage-id="rectProperties" class="label"></div> | 152 | <div data-montage-id="rectProperties" class="label"></div> |
141 | <div data-montage-id="lineProperties" class="label"></div> | 153 | <div data-montage-id="lineProperties" class="label"></div> |
142 | </div> | 154 | </div> |
143 | 155 | <div data-montage-id="endDivider" class="nj-divider divider-vertical toolOptionsSpacer"> </div> | |
144 | <label class="label subOption optionLabel"><input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/>Use WebGL</label> | 156 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> |
145 | |||
146 | <label data-montage-id="materialLabel" class="label">Material:</label> | 157 | <label data-montage-id="materialLabel" class="label">Material:</label> |
147 | <div data-montage-id="strokeIcon" class="pencilToolUp" style="float: left;"></div> | 158 | <div data-montage-id="strokeIcon" class="toolColorChipIcon PencilTool"></div> |
148 | 159 | ||
149 | <select class="selectBox" data-montage-id="strokeMaterialCB"> | 160 | <select class="selectBox" data-montage-id="strokeMaterialCB"> |
150 | </select> | 161 | </select> |
151 | 162 | ||
152 | <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div> | 163 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> |
153 | <select class="selectBox" data-montage-id="fillMaterialCB"> | 164 | <select class="selectBox" data-montage-id="fillMaterialCB"> |
154 | </select> | 165 | </select> |
155 | |||
156 | |||
157 | </div> | 166 | </div> |
158 | </body> | 167 | </body> |
159 | 168 | ||