From 1a759361b82127f9d5c1428dc889fffdf2daaf86 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 3 May 2012 15:11:56 -0700
Subject: First round of moving color chips into the sub tools. Shape and Pen
 tool now have chips in the sub tool bar. Still need to complete adding chips
 to the Brush tool and finalizing the subtool bar layout to our spec for all
 of the subtools.

---
 .../shape-properties.reel/shape-properties.css     | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.css')

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index 0441c1cf..6efa615c 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -2,4 +2,24 @@
  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.
- </copyright> */
\ No newline at end of file
+ </copyright> */
+ 
+ .optionsShapeTool {
+    padding: 6px;
+}
+
+ .optionsShapeTool > * {
+    float:left;
+}
+
+ .optionsShapeTool .fillColorCtrl,  .optionsShapeTool .strokeColorCtrl {
+    width: 20px;
+    height: 18px;
+    margin: 2px 6px;
+}
+
+ .optionsShapeTool .colorCtrlIcon {
+    width: 20px;
+    height: 20px;
+    background-color: rgb(54, 54, 54);
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 29ad6355ef60cfb3b3fc7f780504f3ed30845883 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Mon, 7 May 2012 14:30:47 -0700
Subject: More implementation of moving color chips to the individual subtools.

Removed the tool color bar
Added new icons for inkbottle
Removed Pencil tool
Removed Inkbottle tool
Added chips to the pen, brush and tag tools
Aligned controls in several subtools
---
 .../tools-properties/shape-properties.reel/shape-properties.css    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.css')

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index 6efa615c..1100bc70 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -5,7 +5,7 @@
  </copyright> */
  
  .optionsShapeTool {
-    padding: 6px;
+    padding: 4px;
 }
 
  .optionsShapeTool > * {
@@ -16,10 +16,13 @@
     width: 20px;
     height: 18px;
     margin: 2px 6px;
+    border: 1px black solid;
 }
 
  .optionsShapeTool .colorCtrlIcon {
     width: 20px;
     height: 20px;
-    background-color: rgb(54, 54, 54);
+    margin-top: 2px;
+    -webkit-transform: scale(0.8);
+    background-color: rgb(40, 40, 40);
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 7dd942b6e19d2d7a779bc50e7bf4c8f8780b8f3a Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Wed, 9 May 2012 14:19:14 -0700
Subject: Correct layout and styling for the shape tool and its sub tools

---
 .../shape-properties.reel/shape-properties.css        | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.css')

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index 1100bc70..4dc64d66 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -5,17 +5,26 @@
  </copyright> */
  
  .optionsShapeTool {
-    padding: 4px;
+    padding: 6px;
 }
 
  .optionsShapeTool > * {
     float:left;
 }
 
+.optionsShapeTool select.nj-skinned {
+    margin-top: 2px;
+}
+
+.optionsShapeTool .shapeCustomProps {
+    margin-top: -3px;
+    margin-left: -31px;
+}
+
  .optionsShapeTool .fillColorCtrl,  .optionsShapeTool .strokeColorCtrl {
     width: 20px;
     height: 18px;
-    margin: 2px 6px;
+    margin: 1px 6px;
     border: 1px black solid;
 }
 
@@ -25,4 +34,8 @@
     margin-top: 2px;
     -webkit-transform: scale(0.8);
     background-color: rgb(40, 40, 40);
-}
\ No newline at end of file
+}
+
+.optionsShapeTool checkbox {
+    padding: 6px;
+}
-- 
cgit v1.2.3


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

---
 .../shape-properties.reel/shape-properties.css     | 23 ----------------------
 1 file changed, 23 deletions(-)

(limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.css')

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index 4dc64d66..c1f8a8ce 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -4,14 +4,6 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
  
- .optionsShapeTool {
-    padding: 6px;
-}
-
- .optionsShapeTool > * {
-    float:left;
-}
-
 .optionsShapeTool select.nj-skinned {
     margin-top: 2px;
 }
@@ -21,21 +13,6 @@
     margin-left: -31px;
 }
 
- .optionsShapeTool .fillColorCtrl,  .optionsShapeTool .strokeColorCtrl {
-    width: 20px;
-    height: 18px;
-    margin: 1px 6px;
-    border: 1px black solid;
-}
-
- .optionsShapeTool .colorCtrlIcon {
-    width: 20px;
-    height: 20px;
-    margin-top: 2px;
-    -webkit-transform: scale(0.8);
-    background-color: rgb(40, 40, 40);
-}
-
 .optionsShapeTool checkbox {
     padding: 6px;
 }
-- 
cgit v1.2.3


From 3be15e2076f2d3d46862bbc0ea078b9bf2e161fe Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 10 May 2012 11:17:42 -0700
Subject: -moved sel tool images to proper folder

-finished styling shape tool options
-added new icons for shape tool
---
 .../tools-properties/shape-properties.reel/shape-properties.css  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.css')

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index c1f8a8ce..70a0e780 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -9,10 +9,15 @@
 }
 
 .optionsShapeTool .shapeCustomProps {
-    margin-top: -3px;
-    margin-left: -31px;
+    margin-top: 0px;
+    margin-left: -7px;
 }
 
 .optionsShapeTool checkbox {
     padding: 6px;
+    margin-left: 4px;
 }
+
+.optionsShapeTool .hottextunit {
+    /*width: 46px;*/
+}
\ No newline at end of file
-- 
cgit v1.2.3


From d32cf39a8ef1e2d2fb50f1183c5546fdac83b396 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 10 May 2012 11:18:10 -0700
Subject: removed unnecessary css class

---
 .../tools-properties/shape-properties.reel/shape-properties.css       | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.css')

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index 70a0e780..49d0c778 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -16,8 +16,4 @@
 .optionsShapeTool checkbox {
     padding: 6px;
     margin-left: 4px;
-}
-
-.optionsShapeTool .hottextunit {
-    /*width: 46px;*/
 }
\ No newline at end of file
-- 
cgit v1.2.3