Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 9 insertions, 7 deletions

diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css
index f50a9873..74509555 100644..100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.css
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css
@@ -4,7 +4,7 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-.button {
+.rectProperties .button {
     border:none;
     cursor:default;
     text-align:center;
@@ -12,28 +12,30 @@
     opacity:0.8;
     display:table-cell;
     vertical-align:middle;
-    width:100%;
-    height:100%;
     background-color:#333333;
     color:white;
 }
 
-.button:hover
+.rectProperties .subToolButton {
+    float:left;
+}
+
+.rectProperties .button:hover
 {
     opacity:1;
 }
 
-.button:active
+.rectProperties .button:active
 {
     outline:solid 1px black;
 }
 
-.button.on
+.rectProperties .button.on
 {
     background-color: #333333;
 }
 
-.button.off
+.rectProperties .button.off
 {
     background-color: #cccccc;
     color:black;