aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/brush-properties.reel/brush-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/tools-properties/brush-properties.reel/brush-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/tools-properties/brush-properties.reel/brush-properties.html')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html16
1 files changed, 8 insertions, 8 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 e4cd69b8..38b317e2 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -75,7 +75,7 @@
75 } 75 }
76 } 76 }
77 } 77 }
78 </script> 78 </script>
79 79
80 </head> 80 </head>
81 81
@@ -85,14 +85,14 @@
85 <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> 85 <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div>
86 <div class="nj-divider divider-vertical">&nbsp;</div> 86 <div class="nj-divider divider-vertical">&nbsp;</div>
87 <label class="label"> Width:</label> 87 <label class="label"> Width:</label>
88 <div id="strokeSize" class="label"></div> 88 <div data-montage-id="strokeSize" class="label"></div>
89 <label class="label"> Hardness:</label> 89 <label class="label"> Hardness:</label>
90 <div id="strokeHardness" class="label"></div> 90 <div data-montage-id="strokeHardness" class="label"></div>
91 <input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="nj-skinned"/><label class="label">Smoothing</label> 91 <input data-montage-id="doSmoothing" type="checkbox" name="doSmoothingControl" class="nj-skinned"/><label class="label">Smoothing</label>
92 <div id="smoothingAmount" class="label"></div> 92 <div data-montage-id="smoothingAmount" class="label"></div>
93 <input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="nj-skinned"/><label class="label">Calligraphic</label> 93 <input data-montage-id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="nj-skinned"/><label class="label">Calligraphic</label>
94 <label class="label" id="angleLabel">Angle:</label> 94 <label data-montage-id="angleLabel class="label"">Angle:</label>
95 <div id="strokeAngle" class="label"></div> 95 <div data-montage-id="strokeAngle" class="label"></div>
96 </div> 96 </div>
97 </body> 97 </body>
98 98