From 18370abcf406c6ab36d5c5f2613cb79e756ff6d2 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Wed, 9 May 2012 18:07:32 -0700
Subject: -Consolidated many redundant css classes used in the tool options
 bars

---
 .../ink-bottle-properties.css                      | 24 ++--------------------
 .../ink-bottle-properties.html                     |  4 +++-
 2 files changed, 5 insertions(+), 23 deletions(-)

(limited to 'js/components/tools-properties/ink-bottle-properties.reel')

diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
index 4136339c..3dba17b6 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
@@ -4,21 +4,9 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-.toolOptionsFloatChildren > * {
-    float:left;
-}
-
-.inkBottleOptions {    
-    padding: 6px;
-}
 
-.inkBottleOptions .nj-divider {
-    margin-left: 16px;
-    margin-right: 16px;
-}
-
-.toolOptionsFloatChildren select.nj-skinned {
-    margin-top: 2px;
+.inkBottleOptions select.nj-skinned {
+	margin-top: 2px;
 }
 
 .inkBottleOptions label.disabled {
@@ -35,11 +23,3 @@
     background-color: transparent;
     cursor:default;
 }
-
-.inkBottleOptions .colorCtrlIcon {
-    width: 20px;
-    height: 20px;
-    margin-top: 2px;
-    -webkit-transform: scale(0.8);
-    background-color: rgb(40, 40, 40);
-}
\ No newline at end of file
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 148c71e3..f5b1851f 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -180,7 +180,9 @@
                 </select>
             </div>
 
+            <div class="toolOptionsSpacer">&nbsp;</div>
             <div class="nj-divider divider-vertical">&nbsp;</div>
+            <div class="toolOptionsSpacer">&nbsp;</div>
 
             <div data-montage-id="shapeInkOptions" class="toolOptionsFloatChildren">
                 <input data-montage-id="useStrokeSizeCh" type="checkbox" name="useStrokeControl" class="nj-skinned" title="Apply stroke size"/>
@@ -194,7 +196,7 @@
 
                 <div data-montage-id="materialsContainerIB" class="toolOptionsFloatChildren">
                     <label class="label"> Materials:</label>
-                    <div data-montage-id="strokeIconIB" class="colorCtrlIcon PencilTool"></div>
+                    <div data-montage-id="strokeIconIB" class="toolColorChipIcon PencilTool"></div>
                     <select data-montage-id="strokeMaterialIBCB" class="nj-skinned"></select>
                 </div>
             </div>
-- 
cgit v1.2.3