aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-properties.reel/tools-properties.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/layout/tools-properties.reel/tools-properties.html
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-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/layout/tools-properties.reel/tools-properties.html')
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html32
1 files changed, 16 insertions, 16 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index c51ab27d..a24ce658 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -157,22 +157,22 @@
157 </head> 157 </head>
158 158
159 <body> 159 <body>
160 <div id="toolsProperties" class="panelBackground"> 160 <div data-montage-id="toolsProperties" class="panelBackground">
161 <div id="selectionProperties"></div> 161 <div data-montage-id="selectionProperties"></div>
162 <div id="subSelectionProperties"></div> 162 <div data-montage-id="subSelectionProperties"></div>
163 <div id="object3DProperties"></div> 163 <div data-montage-id="object3DProperties"></div>
164 <div id="tagProperties"></div> 164 <div data-montage-id="tagProperties"></div>
165 <div id="penProperties"></div> 165 <div data-montage-id="penProperties"></div>
166 <div id="textProperties"></div> 166 <div data-montage-id="textProperties"></div>
167 <div id="shapeProperties"></div> 167 <div data-montage-id="shapeProperties"></div>
168 <div id="brushProperties"></div> 168 <div data-montage-id="brushProperties"></div>
169 <div id="fillProperties"></div> 169 <div data-montage-id="fillProperties"></div>
170 <div id="inkbottleProperties"></div> 170 <div data-montage-id="inkbottleProperties"></div>
171 <div id="eraserProperties"></div> 171 <div data-montage-id="eraserProperties"></div>
172 <div id="rotateStageProperties"></div> 172 <div data-montage-id="rotateStageProperties"></div>
173 <div id="panProperties"></div> 173 <div data-montage-id="panProperties"></div>
174 <div id="zoomProperties"></div> 174 <div data-montage-id="zoomProperties"></div>
175 <div id="disabledCondition" class="panelDisabled"></div> 175 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
176 </div> 176 </div>
177 </body> 177 </body>
178</html> 178</html>