2 files changed, 36 insertions, 87 deletions

diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index dd8cee04..8baffc95 100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -855,20 +855,7 @@ div.pp-button.button-divider div {
 
 //  End: Tree component for Project Panel  
 
-
-.subToolHolderPanel{
-    margin-left:42px
-}
-
-.subToolPanel{
-    margin-top:-6px
-}
-
-// .marginposition{ 
-    // margin-top:-26px 
-// } 
 //  Begin: Properties Panel styles  
-
 .properties_panel {
         overflow-x: hidden;
         color: $color-panel-text;
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 637828a4..24846138 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -11,8 +11,11 @@
 // _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
 // 
   
-
-// Made changes to toolButton  }
+.subToolHolderPanel {
+    margin-left: 42px;
+    padding: 6px;
+    float:left;
+}
 
 .subToolHolderPanel .toolbutton {
     float:left;
@@ -24,53 +27,37 @@
     -webkit-transform: scale(0.75);
 }
 
-.toolOptionsSpacer{
-    margin-right: 9px;
-}
-
-/* These appear to be unused
-.toolSeparator {
-    height:1px;
-    width:30px;
-    // margin-left: 3px; 
-    // margin-right: 3px; 
+.toolOptionsFloatChildren > * {
+    float:left;
 }
 
-.toolSeparatorTop {
-    margin-top: 3px;
-    margin-bottom: 0px;
-}
+// .toolOptionsFloatChildren select.nj-skinned {
+//     margin-top: 2px;
+// }
 
-.toolSeparatorMiddle {
-    margin-top: 0px;
-    margin-bottom: 0px;
-}
 
-.toolSeparatorBottom {
-    margin-top: 0px;
-    margin-bottom: 3px;
+.toolOptionsSpacer {
+    margin-right: 9px;
 }
 
-.toolImageBase {
-    padding: 0px;
-    width: 26px;
-    height: 23px;
-    opacity: 0.7;
-    background-repeat:no-repeat;
+.toolColorChipCtrl {
+    width: 18px;
+    height: 18px;
+    margin-top: 1px;
+    margin-left: 3px;    
+    margin-right: 8px;    
+    border: 1px black solid;
 }
 
-.toolImageBase:hover {
-   opacity: 1.0;
-   }
-
-.drawingMode {
-    outline:blue solid thin;
+.toolColorChipIcon {
+    width: 20px;
+    height: 20px;
+    margin-top: 1px;
+    -webkit-transform: scale(0.8);
+    background-color: rgb(40, 40, 40);
 }
-*/
-
 
 //  Added new styling Sub Tool Shape Options 
-
 .textBox {
 
    padding-top:3px;
@@ -135,20 +122,20 @@
 .cornerRadius.topRight
 {
     -webkit-transform: rotate(90deg);
-    margin-right : -2px;
+//     margin-right : -2px;
 }
 
 .cornerRadius.bottomLeft
 {
-    margin-top: 3px;
+//     margin-top: 3px;
     -webkit-transform: rotate(270deg);
 }
 
 .cornerRadius.bottomRight
 {
-    margin-top: 3px;
+//     margin-top: 3px;
     -webkit-transform: rotate(180deg);
-    margin-right : -2px;
+//     margin-right : -2px;
 }
 
 #toolOptionsContainer
@@ -292,7 +279,7 @@ input[type="radio"]:disabled {
         margin: 0px;
         padding: 0px;
         margin-right: 5px;
-        margin-top: 4px;
+        margin-top: 0px;
         background-repeat: no-repeat;
         opacity: 0.8;
         text-indent: -9999px;
@@ -353,35 +340,18 @@ input[type="radio"]:disabled {
         height: 100%;
         float: left;
         position: relative;
-        top: 5px;
 }
 
 .tagRadioButtons select.nj-skinned {
         visibility: visible;
         position: relative;
+        margin-top: 1px;
 }
 
 .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: rgb(40, 40, 40);
-}
 //  End: styles for tag toolbar  
 
 #zoomToolOptionHolder input#zoomInTool:checked{
@@ -430,9 +400,7 @@ input[type="radio"]:disabled {
         display: block;
         float: left;
         margin: 0px;
-        padding: 0px;
-        margin-right: 5px;
-        margin-top: 4px;
+        margin-right: 5px;
         background-repeat: no-repeat;
         opacity: 0.8;
         text-indent: -9999px;
@@ -470,15 +438,7 @@ input[type="radio"]:disabled {
         background-position: 0px -20px;
 }
 
-// Selection Tool Options
-.optionsSelectionTool {
-    padding: 6px;
-}
-
- .optionsSelectionTool > * {
-    float:left;
-}
-
+// Selection Tool Options Styles
 .optionsSelectionTool button {
         padding-top: 0px;
 }
@@ -489,6 +449,7 @@ input[type="radio"]:disabled {
         background-repeat:no-repeat;
         background-position: 1px 2px;
 }
+
 .alignTopIcon {
         background-image: url("../images/tools/AlignTop.png");  
 }
@@ -551,4 +512,5 @@ input[type="radio"]:disabled {
 
 .distRightIcon {
         background-image: url("../images/tools/DistRight.png");