aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/brush-properties.reel
diff options
context:
space:
mode:
authorhwc4872012-04-26 13:04:25 -0700
committerhwc4872012-04-26 13:04:25 -0700
commit37f2d5230175c0fb9a4792f5e3d804f7604442e1 (patch)
treec8260f151270c6bdbe08869ebaeb837777c28d1b /js/components/tools-properties/brush-properties.reel
parentf13d0f45f6b449764898e99db309c43b51a33476 (diff)
parent902dc18296fc78f3b8e67d952c42981d926bb2fc (diff)
downloadninja-37f2d5230175c0fb9a4792f5e3d804f7604442e1.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 98442164..d9c35dc2 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -84,7 +84,7 @@
84 </head> 84 </head>
85 85
86 <body> 86 <body>
87 <div id="brushProperties" class="subToolHolderPanel"> 87 <div data-montage-id="brushProperties" class="subToolHolderPanel">
88 <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> 88 <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
89 <label class="label"> Width:</label> 89 <label class="label"> Width:</label>
90 <div id="strokeSize" class="label"></div> 90 <div id="strokeSize" class="label"></div>