diff options
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 | 16 |
1 files changed, 12 insertions, 4 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..e84f8092 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"}, |
| @@ -127,21 +132,24 @@ | |||
| 127 | </head> | 132 | </head> |
| 128 | 133 | ||
| 129 | <body> | 134 | <body> |
| 130 | <div data-montage-id="shapeProperties" class="subToolHolderPanel"> | 135 | <div data-montage-id="shapeProperties" class="subToolHolderPanel optionsShapeTool"> |
| 131 | <div data-montage-id="shapeToolsList"> | 136 | <div data-montage-id="shapeToolsList"> |
| 132 | <div data-montage-id="toolbutton"></div> | 137 | <div data-montage-id="toolbutton"></div> |
| 133 | </div> | 138 | </div> |
| 134 | 139 | <div class="colorCtrlIcon PencilTool"></div> | |
| 140 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> | ||
| 141 | <div data-montage-id="fillColorCtrlIcon" class="colorCtrlIcon FillTool"></div> | ||
| 142 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> | ||
| 143 | <div class="nj-divider divider-vertical"> </div> | ||
| 135 | <label class="label">Stroke:</label> | 144 | <label class="label">Stroke:</label> |
| 136 | <div data-montage-id="strokeControl" class="label"></div> | 145 | <div data-montage-id="strokeControl" class="label"></div> |
| 137 | |||
| 138 | <div id="customProperties"> | 146 | <div id="customProperties"> |
| 139 | <div data-montage-id="ovalProperties" class="label"></div> | 147 | <div data-montage-id="ovalProperties" class="label"></div> |
| 140 | <div data-montage-id="rectProperties" class="label"></div> | 148 | <div data-montage-id="rectProperties" class="label"></div> |
| 141 | <div data-montage-id="lineProperties" class="label"></div> | 149 | <div data-montage-id="lineProperties" class="label"></div> |
| 142 | </div> | 150 | </div> |
| 143 | 151 | ||
| 144 | <label class="label subOption optionLabel"><input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/>Use WebGL</label> | 152 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> |
| 145 | 153 | ||
| 146 | <label data-montage-id="materialLabel" class="label">Material:</label> | 154 | <label data-montage-id="materialLabel" class="label">Material:</label> |
| 147 | <div data-montage-id="strokeIcon" class="pencilToolUp" style="float: left;"></div> | 155 | <div data-montage-id="strokeIcon" class="pencilToolUp" style="float: left;"></div> |