aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/pen-properties.reel/pen-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/pen-properties.reel/pen-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/pen-properties.reel/pen-properties.html')
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index 9bae188e..446b0a02 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -34,7 +34,7 @@
34 } 34 }
35 } 35 }
36 } 36 }
37 </script> 37 </script>
38 38
39 </head> 39 </head>
40 40
@@ -45,9 +45,9 @@
45 <div class="colorCtrlIcon FillTool"></div> 45 <div class="colorCtrlIcon FillTool"></div>
46 <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> 46 <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div>
47 <div class="nj-divider divider-vertical">&nbsp;</div> 47 <div class="nj-divider divider-vertical">&nbsp;</div>
48 <label class="label"> Stroke:</label> 48 <label class="label"> Stroke:</label>
49 <div id="strokeSize" class="label"></div> 49 <div data-montage-id="strokeSize" class="label"></div>
50 </div> 50 </div>
51 </body> 51 </body>
52 52
53</html> \ No newline at end of file 53</html> \ No newline at end of file