diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/tools-properties/shape-properties.reel/shape-properties.html | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
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 | 28 |
1 files changed, 14 insertions, 14 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 cc3534f2..e84f8092 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html | |||
| @@ -126,15 +126,15 @@ | |||
| 126 | 126 | ||
| 127 | } | 127 | } |
| 128 | } | 128 | } |
| 129 | </script> | 129 | </script> |
| 130 | 130 | ||
| 131 | 131 | ||
| 132 | </head> | 132 | </head> |
| 133 | 133 | ||
| 134 | <body> | 134 | <body> |
| 135 | <div id="shapeProperties" class="subToolHolderPanel optionsShapeTool"> | 135 | <div data-montage-id="shapeProperties" class="subToolHolderPanel optionsShapeTool"> |
| 136 | <div id="shapeToolsList"> | 136 | <div data-montage-id="shapeToolsList"> |
| 137 | <div id="toolbutton"></div> | 137 | <div data-montage-id="toolbutton"></div> |
| 138 | </div> | 138 | </div> |
| 139 | <div class="colorCtrlIcon PencilTool"></div> | 139 | <div class="colorCtrlIcon PencilTool"></div> |
| 140 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> | 140 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> |
| @@ -142,23 +142,23 @@ | |||
| 142 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> | 142 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> |
| 143 | <div class="nj-divider divider-vertical"> </div> | 143 | <div class="nj-divider divider-vertical"> </div> |
| 144 | <label class="label">Stroke:</label> | 144 | <label class="label">Stroke:</label> |
| 145 | <div id="strokeControl" class="label"></div> | 145 | <div data-montage-id="strokeControl" class="label"></div> |
| 146 | <div id="customProperties"> | 146 | <div id="customProperties"> |
| 147 | <div id="ovalProperties" class="label"></div> | 147 | <div data-montage-id="ovalProperties" class="label"></div> |
| 148 | <div id="rectProperties" class="label"></div> | 148 | <div data-montage-id="rectProperties" class="label"></div> |
| 149 | <div id="lineProperties" class="label"></div> | 149 | <div data-montage-id="lineProperties" class="label"></div> |
| 150 | </div> | 150 | </div> |
| 151 | 151 | ||
| 152 | <input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> | 152 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> |
| 153 | 153 | ||
| 154 | <label id="materialLabel" class="label">Material:</label> | 154 | <label data-montage-id="materialLabel" class="label">Material:</label> |
| 155 | <div id="strokeIcon" class="pencilToolUp" style="float: left;"></div> | 155 | <div data-montage-id="strokeIcon" class="pencilToolUp" style="float: left;"></div> |
| 156 | 156 | ||
| 157 | <select class="selectBox" id="strokeMaterialCB"> | 157 | <select class="selectBox" data-montage-id="strokeMaterialCB"> |
| 158 | </select> | 158 | </select> |
| 159 | 159 | ||
| 160 | <div id="fillIcon" class="bucketToolUp" style="float: left;"></div> | 160 | <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div> |
| 161 | <select class="selectBox" id="fillMaterialCB"> | 161 | <select class="selectBox" data-montage-id="fillMaterialCB"> |
| 162 | </select> | 162 | </select> |
| 163 | 163 | ||
| 164 | 164 | ||