From c48eeb01bd726895dc577d8b843b2a75883eee07 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 16:03:52 -0800
Subject: Merge from /joseeight/ninja-internal/tree/FileIO

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../text-properties.reel/text-properties.css       | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

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

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index d581c6c3..6aa61812 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -5,29 +5,33 @@
  </copyright> */
 
 .optionsTextTool {
-    display: -webkit-box;
-    -webkit-box-orient:horizontal;
-    -webkit-box-align: stretch;
-    padding: 5px;
+    padding: 6px;
 }
 
-
-.optionsTextTool > * {
-    -webkit-box-flex:0;
+.optionsTextTool .btnGroup {
+    padding: 0px 8px;
 }
 
-.optionsTextTool .button {
-    width: auto;
-
+.optionsTextTool > *, .optionsTextTool .btnGroup > * {
+    float:left;
 }
 
-.optionsTextTool .hottextunit {
-    padding-top:5px;
+.optionsTextTool button {
+    width: auto;
+    padding: 4px 8px !important;
+    margin-left:4px;
 }
 
 .optionsTextTool .label, .optionsTextTool .hottextunit {
-    float:none;
     font-size:11px;
 }
 
+.optionsTextTool .fontSelection {
+    width:100px;
+}
 
+.optionsTextTool .fontColor {
+    width: 20px;
+    height: 18px;
+    margin: 2px 6px;
+}
\ No newline at end of file
-- 
cgit v1.2.3