From e973618155eeca6b3608c9d303669e20baeaf0ff Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 8 May 2012 10:08:30 -0700
Subject: moved all tag tool css back into the scss file

added extra padding before first input control
---
 css/ninja.css                                      |  6 +++++-
 .../tag-properties.reel/tag-properties.css         | 17 ---------------
 scss/imports/scss/_Tools.scss                      | 25 ++++++++++++++++------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/css/ninja.css b/css/ninja.css
index 9740317d..24600b49 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -773,7 +773,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .tagRadioButtons input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; }
 
-.tagRadioButtons input.divTool { background-position: -40px 0px; }
+.tagRadioButtons input.divTool { margin-left: 8px; background-position: -40px 0px; }
 
 .tagRadioButtons input.divTool:checked { background-position: -40px -20px; }
 
@@ -799,6 +799,10 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; }
 
+.tagRadioButtons .fillColorCtrl { width: 18px; height: 18px; margin-top: 6px; margin-left: 3px; margin-right: 8px; border: 1px black solid; }
+
+.tagRadioButtons .colorCtrlIcon { width: 20px; height: 20px; margin-top: 6px; -webkit-transform: scale(0.8); background-color: #282828; }
+
 #zoomToolOptionHolder input#zoomInTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; }
 
 #zoomToolOptionHolder input#zoomOutTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; }
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.css b/js/components/tools-properties/tag-properties.reel/tag-properties.css
index 7969dff9..018448f1 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.css
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.css
@@ -3,20 +3,3 @@
  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.
  </copyright> */
-
- .tagRadioButtons .fillColorCtrl {
-    width: 18px;
-    height: 18px;
-    margin-top: 6px;
-    margin-left: 3px;    
-    margin-right: 8px;    
-    border: 1px black solid;
-}
-
- .tagRadioButtons .colorCtrlIcon {
-    width: 20px;
-    height: 20px;
-    margin-top: 6px;
-    -webkit-transform: scale(0.8);
-    background-color: rgb(40, 40, 40);
-}
\ No newline at end of file
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index fd75e189..9f0489b4 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -323,6 +323,7 @@ input[type="radio"]:disabled {
 	-webkit-box-shadow: none;
 }
 .tagRadioButtons input.divTool {
+	margin-left: 8px;
 	background-position: -40px 0px;
 }
 .tagRadioButtons input.divTool:checked {
@@ -370,6 +371,24 @@ input[type="radio"]:disabled {
 	visibility: hidden;
 }
 
+.tagRadioButtons .fillColorCtrl {
+    width: 18px;
+    height: 18px;
+    margin-top: 6px;
+    margin-left: 3px;    
+    margin-right: 8px;    
+    border: 1px black solid;
+}
+
+.tagRadioButtons .colorCtrlIcon {
+    width: 20px;
+    height: 20px;
+    margin-top: 6px;
+    -webkit-transform: scale(0.8);
+    background-color: rgb(40, 40, 40);
+}
+//  End: styles for tag toolbar  
+
 #zoomToolOptionHolder input#zoomInTool:checked{
     border-style:solid;
     border-width:1px ;
@@ -377,7 +396,6 @@ input[type="radio"]:disabled {
     background-image:url("../images/optionsbar/zoom/zoom_plus.png");
     background-repeat: no-repeat;
     background-position:4px 3px;
-  
 }
 
 #zoomToolOptionHolder input#zoomOutTool:checked{
@@ -387,8 +405,6 @@ input[type="radio"]:disabled {
     background-image:url("../images/optionsbar/zoom/zoom_minus.png");
     background-repeat: no-repeat;
     background-position:4px 3px;
-
-
 }
 
 #zoomToolOptionHolder input#zoomInTool{
@@ -397,7 +413,6 @@ input[type="radio"]:disabled {
     background-image:url("../images/optionsbar/zoom/zoom_plus.png");
     background-repeat: no-repeat;
     background-position:4px 3px;
-
 }
 
 #zoomToolOptionHolder input#zoomOutTool{
@@ -410,9 +425,7 @@ input[type="radio"]:disabled {
 }
 #zoomToolOptionHolder input.zoom-option {
     background:none;
-
 }
-//  End: styles for tag toolbar  
 
 // object 3D container styles
 .object3DToolContainer input.tag-type {
-- 
cgit v1.2.3