16 files changed, 39 insertions, 148 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css
index 0912dd7e..102a79db 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.css
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css
@@ -4,25 +4,4 @@
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
- .optionsBrushTool {
-    padding: 6px;
-}
- .optionsBrushTool > * {
-    float:left;
-}
- .optionsBrushTool .fillColorCtrl {
-    width: 20px;
-    height: 18px;
-    margin-left: 3px;    
-    margin-right: 8px;    
-    border: 1px black solid;
-}
- .optionsBrushTool .colorCtrlIcon {
-    width: 20px;
-    height: 20px;
-    -webkit-transform: scale(0.8);
-    background-color: rgb(40, 40, 40);
-}
-\ No newline at end of file
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index a820dd04..7d99a42a 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -80,9 +80,9 @@
    </head>
    <body>
-        <div data-montage-id="brushProperties" class="subToolHolderPanel optionsBrushTool">
+        <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren">
-            <div class="colorCtrlIcon FillTool"></div>
+            <div class="toolColorChipIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div>
+            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
            <div class="nj-divider divider-vertical">&nbsp;</div>
            <label class="label"> Width:</label>
            <div data-montage-id="strokeSize" class="label"></div>
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.css b/js/components/tools-properties/fill-properties.reel/fill-properties.css
index fa2e75e6..606e73b3 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.css
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.css
@@ -4,32 +4,11 @@
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
-.optionsFillTool {
-    padding: 6px;
-}
-.optionsFillTool > * {
-    float:left;
-}
-.optionsFillTool > * > *{
-    float:left;
-}
-.optionsFillTool label {
-    margin-right: 8px;
-} 
-.optionsFillTool .colorCtrlIcon {
-    width: 20px;
-    height: 20px;
-    margin-top: 0px;
-    margin-left: 10px;    
-    -webkit-transform: scale(0.8);
-    background-color: rgb(40, 40, 40);
-}
 .materialsContainerOptions select {
    margin-top: 2px;
 }
 .materialsContainerOptions label {
-    margin-right: 0px;
+    margin-right: 3px;
 }
 \ No newline at end of file
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index 9fb84a1b..975b4e6f 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -34,12 +34,12 @@
    </head>
    <body>
-        <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool">
+        <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren">
            <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/>
            <label class="label">Use WebGL</label>
-            <div data-montage-id="materialsContainer" class="materialsContainerOptions">
+            <div data-montage-id="materialsContainer" class="materialsContainerOptions toolOptionsFloatChildren">
                <label class="label">Material:</label>
-                <div data-montage-id="fillIcon" class="colorCtrlIcon FillTool"></div>
+                <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div>
                <select data-montage-id="fillMaterialCB" class="nj-skinned">
                </select>
            </div>
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 {
+.inkBottleOptions select.nj-skinned {
-    margin-left: 16px;
+        margin-top: 2px;
-    margin-right: 16px;
-}
-.toolOptionsFloatChildren 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 @@

diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css index 0912dd7e..102a79db 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.css +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css
@@ -4,25 +4,4 @@
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */	5	</copyright> */
6		6
7	.optionsBrushTool {
8	padding: 6px;
9	}
10		7
11	.optionsBrushTool > * {
12	float:left;
13	}
14
15	.optionsBrushTool .fillColorCtrl {
16	width: 20px;
17	height: 18px;
18	margin-left: 3px;
19	margin-right: 8px;
20	border: 1px black solid;
21	}
22
23	.optionsBrushTool .colorCtrlIcon {
24	width: 20px;
25	height: 20px;
26	-webkit-transform: scale(0.8);
27	background-color: rgb(40, 40, 40);
28	} \ No newline at end of file


diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index a820dd04..7d99a42a 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -80,9 +80,9 @@
80	</head>	80	</head>
81		81
82	<body>	82	<body>
83	<div data-montage-id="brushProperties" class="subToolHolderPanel optionsBrushTool">	83	<div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren">
84	<div class="colorCtrlIcon FillTool"></div>	84	<div class="toolColorChipIcon FillTool"></div>
85	<div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div>	85	<div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
86	<div class="nj-divider divider-vertical"> </div>	86	<div class="nj-divider divider-vertical"> </div>
87	<label class="label"> Width:</label>	87	<label class="label"> Width:</label>
88	<div data-montage-id="strokeSize" class="label"></div>	88	<div data-montage-id="strokeSize" class="label"></div>


diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.css b/js/components/tools-properties/fill-properties.reel/fill-properties.css index fa2e75e6..606e73b3 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.css +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.css
@@ -4,32 +4,11 @@
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */	5	</copyright> */
6		6
7	.optionsFillTool {
8	padding: 6px;
9	}
10	.optionsFillTool > * {
11	float:left;
12	}
13	.optionsFillTool > * > *{
14	float:left;
15	}
16
17	.optionsFillTool label {
18	margin-right: 8px;
19	}
20	.optionsFillTool .colorCtrlIcon {
21	width: 20px;
22	height: 20px;
23	margin-top: 0px;
24	margin-left: 10px;
25	-webkit-transform: scale(0.8);
26	background-color: rgb(40, 40, 40);
27	}
28		7
29	.materialsContainerOptions select {	8	.materialsContainerOptions select {
30	margin-top: 2px;	9	margin-top: 2px;
31	}	10	}
32		11
33	.materialsContainerOptions label {	12	.materialsContainerOptions label {
34	margin-right: 0px;	13	margin-right: 3px;
35	} \ No newline at end of file	14	} \ No newline at end of file


diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index 9fb84a1b..975b4e6f 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -34,12 +34,12 @@
34	</head>	34	</head>
35		35
36	<body>	36	<body>
37	<div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool">	37	<div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren">
38	<input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/>	38	<input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/>
39	<label class="label">Use WebGL</label>	39	<label class="label">Use WebGL</label>
40	<div data-montage-id="materialsContainer" class="materialsContainerOptions">	40	<div data-montage-id="materialsContainer" class="materialsContainerOptions toolOptionsFloatChildren">
41	<label class="label">Material:</label>	41	<label class="label">Material:</label>
42	<div data-montage-id="fillIcon" class="colorCtrlIcon FillTool"></div>	42	<div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div>
43	<select data-montage-id="fillMaterialCB" class="nj-skinned">	43	<select data-montage-id="fillMaterialCB" class="nj-skinned">
44	</select>	44	</select>
45	</div>	45	</div>


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 @@
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */	5	</copyright> */
6		6
7	.toolOptionsFloatChildren > * {
8	float:left;
9	}
10
11	.inkBottleOptions {
12	padding: 6px;
13	}
14		7
15	.inkBottleOptions .nj-divider {	8	.inkBottleOptions select.nj-skinned {
16	margin-left: 16px;	9	margin-top: 2px;
17	margin-right: 16px;
18	}
19
20	.toolOptionsFloatChildren select.nj-skinned {
21	margin-top: 2px;
22	}	10	}
23		11
24	.inkBottleOptions label.disabled {	12	.inkBottleOptions label.disabled {
@@ -35,11 +23,3 @@
35	background-color: transparent;	23	background-color: transparent;
36	cursor:default;	24	cursor:default;
37	}	25	}
38
39	.inkBottleOptions .colorCtrlIcon {
40	width: 20px;
41	height: 20px;
42	margin-top: 2px;
43	-webkit-transform: scale(0.8);
44	background-color: rgb(40, 40, 40);
45	} \ 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 @@
180	</select>	180	</select>
181	</div>	181	</div>
182		182
		183	<div class="toolOptionsSpacer"> </div>
183	<div class="nj-divider divider-vertical"> </div>	184	<div class="nj-divider divider-vertical"> </div>
		185	<div class="toolOptionsSpacer"> </div>
184		186
185	<div data-montage-id="shapeInkOptions" class="toolOptionsFloatChildren">	187	<div data-montage-id="shapeInkOptions" class="toolOptionsFloatChildren">
186	<input data-montage-id="useStrokeSizeCh" type="checkbox" name="useStrokeControl" class="nj-skinned" title="Apply stroke size"/>	188	<input data-montage-id="useStrokeSizeCh" type="checkbox" name="useStrokeControl" class="nj-skinned" title="Apply stroke size"/>
@@ -194,7 +196,7 @@