4 files changed, 121 insertions, 114 deletions

diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_Tools.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_Tools.scssc
index 13e0ffc9..75baa48d 100644
--- a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_Tools.scssc
+++ b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_Tools.scssc
@@ -1,11 +1,11 @@
 3.0.24 (Classy Cassidy)
-d13bec2b6761e63701ae6297725d5434048f64ff
+b621b9b6f8ebccf9ea7facc45dd7388d550fb0e5
 o:Sass::Tree::RootNode
 :
 @linei:
@options{:
 style:compact:load_paths[",/Users/DHG637/Sites/ninja-internal/scss"o/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/blueprint/stylesheets"
~/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/_blueprint_deprecated_imports/stylesheets"m/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/compass/stylesheets"
|/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/_compass_deprecated_imports/stylesheets"l/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-960-plugin-0.10.0/lib/../stylesheets"j/Applications/compass.app/Contents/Resources/ruby/gem/gems/html5-boilerplate-0.2.6/lib/../stylesheets:
 cacheT:cache_location"8/Users/DHG637/Sites/ninja-internal/scss/.sass-cache:syntax:    scss:
-quietT:
filename"E/Users/DHG637/Sites/ninja-internal/scss/imports/scss/_Tools.scss:css_filename"=/Users/DHG637/Sites/ninja-internal/scss/../css/ninja.css:line_comments0:property_syntax0:@has_childrenT:@template"�$// <copyright>
+quietT:
filename"E/Users/DHG637/Sites/ninja-internal/scss/imports/scss/_Tools.scss:css_filename"=/Users/DHG637/Sites/ninja-internal/scss/../css/ninja.css:line_comments0:property_syntax0:@has_childrenT:@template"%// <copyright>
 // This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 // No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
 // (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
@@ -19,14 +19,15 @@ quietT:
filename"E/Users/DHG637/Sites/ninja-internal/scss/imports/scss/_Tools.sc
 // 
   
 
-// Made changes to toolButton  
+// Made changes to toolButton  }
 
-.subToolButton {
+.subToolHolderPanel .toolbutton {
     float:left;
+    -webkit-transform: scale(0.6);
 }
 
-#topPanelContainer .subToolButton {
-
+.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active {
+    -webkit-transform: scale(0.75);
 }
 
 .subOption{
@@ -476,117 +477,122 @@ input[type="radio"]:disabled {
  * For individual tool styles in the toolbar, see toolbar.scss.
  * Note that colors and font definitions go in 
  * _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
- *  */;i;[
+ *  */;i;[
 @tabsi
-@rule[".subToolButton;T;i;[o:Sass::Tree::PropNode;i
+@rule["$.subToolHolderPanel .toolbutton;T;i;[o:Sass::Tree::PropNode;i
 @name["
-float;@:@prop_syntax:new;o:Sass::Script::String:
@context:default;"    left:
-@type:identifier;i;[
-o;;i
-float;@; ;!;o;";#;$;"      left;%;&;i;[
-width;@; ;!;o;";#;$;"      30px;%;&;i(;[
- * margin-right: 3px;  */;i);[
-o;;i
-width;@; ;!;o;";#;$;"      26px;%;&;i>;[
-width;@; ;!;o;";#;$;"      10em;%;&;i[;[
-float;@; ;!;o;";#;$;"      left;%;&;i^;[
-block;%;&;i_;[
-;#;$;ib;@
;"
-solid;%;&;0o;'  ;#;$;ib;"color-tool-select-border;@
;ib;[
-color;@; ;!;o;'      ;#;$;ic;"color-tool-text;{
-color;@; ;!;o;'      ;#;$;ij;"color-tool-select-border;{
- * line-height:10px;  */;iq;[
-float;@; ;!;o;";#;$;"      left;%;&;is;[
-o;;i
+float;@:@prop_syntax:new;o:Sass::Script::String:
@context:default:
+@type:identifier;"    left;i;[
 :
-@args[o;"
-;#;$;i};{
-width;@; ;!;o;";#;$;"      17px;%;&;i;[
-o;;i
-;2[o;"
-;#;$;i
�;{
-width;@; ;!;o;";#;$;"      17px;%;&;i
�;[
-o;;i
-;2[o;"
-;#;$;i
�;{
-width;@; ;!;o;";#;$;"      16px;%;&;i
�;[
-;2[o;,;#;$;{
-;2[o;,;#;$;{
-90deg;/[
-;2[o;,;#;$;{
-;2[o;,;#;$;{
-float;@; ;!;o;";#;$;"      left;%;&;i
�;[
-float;@; ;!;o;";#;$;"      left;%;&;i
�;[
-width;@; ;!;o;";#;$;"      28px;%;&;i
�;[
-solid;%;&;i
�;[
-color;@; ;!;o;'      ;#;$;i
�;"color-radio;{
-solid;%;&;i
�;[
-solid;%;&;i
�;[
-solid;%;&;i
�;[
-float;@; ;!;o;";#;$;"      left;%;&;i
�;[
-width;@; ;!;o;";#;$;"      100%;%;&;i
�;[
-float;@; ;!;o;";#;$;"      left;%;&;i
�;[
+@args[o:Sass::Script::Number;#;$;{
+scale;i;@0;i;[
+;([o;);#;$;{
+scale;i;@A;i;[
+o;;i
+float;@; ;!;o;";#;$;%;&;"  left;i ;[
+width;@; ;!;o;";#;$;%;&;"  30px;i);[
+ * margin-right: 3px;  */;i*;[
+o;;i
+width;@; ;!;o;";#;$;%;&;"  26px;i?;[
+width;@; ;!;o;";#;$;%;&;"  10em;i\;[
+float;@; ;!;o;";#;$;%;&;"  left;i_;[
+block;i`;[
+;#;$;ic;@8
;%;&;"
+solid;2o;-      ;#;$;"color-tool-select-border;ic;@8
;ic;[
+color;@; ;!;o;-      ;#;$;"color-tool-text;id;{
+color;@; ;!;o;-      ;#;$;"color-tool-select-border;ik;{
+ * line-height:10px;  */;ir;[
+float;@; ;!;o;";#;$;%;&;"  left;it;[
+o;;i
+;([o;"
+;#;$;i~;{
+width;@; ;!;o;";#;$;%;&;"  17px;i
{;[
+o;;i
+;([o;"
+;#;$;i
�;{
+width;@; ;!;o;";#;$;%;&;"  17px;i
�;[
+o;;i
+;([o;"
+;#;$;i
�;{
+width;@; ;!;o;";#;$;%;&;"  16px;i
�;[
+;([o;);#;$;{
+;([o;);#;$;{
+90deg;,[
+;([o;);#;$;{
+;([o;);#;$;{
+float;@; ;!;o;";#;$;%;&;"  left;i
�;[
+float;@; ;!;o;";#;$;%;&;"  left;i
�;[
+width;@; ;!;o;";#;$;%;&;"  28px;i
�;[
+solid;i
�;[
+color;@; ;!;o;-      ;#;$;"color-radio;i
�;{
+solid;i
�;[
+solid;i
�;[
+solid;i
�;[
+float;@; ;!;o;";#;$;%;&;"  left;i
�;[
+width;@; ;!;o;";#;$;%;&;"  100%;i
�;[
+float;@; ;!;o;";#;$;%;&;"  left;i
�;[
 o;;@;i
- * margin-left:-5em;  */;i
�;[
-float;@; ;!;o;";#;$;"      left;%;&;i
�;[
+ * margin-left:-5em;  */;i
�;[
+float;@; ;!;o;";#;$;%;&;"  left;i
�;[
 o;;i
-float;@; ;!;o;";#;$;"
-right;%;&;i
�;[
-;2[o;,;#;$;{
-;2[o;,;#;$;{
-;-["px;i0
;."5px;/[
+float;@; ;!;o;";#;$;%;&;"
+right;i
�;[
+
;[
+;([o;);#;$;{
+;([o;);#;$;{
+;*["px;i1
;+"5px;,[
 #rotateObjectToolContainer input.tag-type,
-#translateObjectToolContainer input.tag-type;T;i6
;[o;;i
-width;@; ;!;o;";#;$;"      20px;%;&;i8
;[
-block;%;&;i:
;[
-float;@; ;!;o;";#;$;"      left;%;&;i;
;[
-;2[o;"
-;#;$;iI
;{
-;2[o;"
-;#;$;iL
;{
-;2[o;"
-;#;$;iO
;{
+#translateObjectToolContainer input.tag-type;T;i7
;[o;;i
+width;@; ;!;o;";#;$;%;&;"  20px;i9
;[
+block;i;
;[
+float;@; ;!;o;";#;$;%;&;"  left;i<
;[
+;([o;"
+;#;$;iJ
;{
+;([o;"
+;#;$;iM
;{
+;([o;"
+;#;$;iP
;{
 #rotateObjectToolContainer input.tag-type:active,
-#translateObjectToolContainer input.tag-type:active;T;iT
;[o;;i
+#translateObjectToolContainer input.tag-type:active;T;iU
;[o;;i
 #rotateObjectToolContainer input.tag-type:hover,
-#translateObjectToolContainer input.tag-type:hover;T;iY
;[o;;i
+#translateObjectToolContainer input.tag-type:hover;T;iZ
;[o;;i
 #rotateObjectToolContainer input.tag-type:checked,
-#translateObjectToolContainer input.tag-type:checked;T;i_
;[        o;;i
--40px;/[
--40px;/[
--20px;/[
--60px;/[
+#translateObjectToolContainer input.tag-type:checked;T;i`
;[        o;;i
+-40px;,[
+-40px;,[
+-20px;,[
+-60px;,[