From 67e39072da76ac79955e8c2c001e17b01311d313 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 15 May 2012 17:07:22 -0700 Subject: -added new images for the text tool options -simplified text options CSS -fixed styling to accommodate new images --- .../text-properties.reel/text-properties.css | 27 ++++++----- .../text-properties.reel/text-properties.html | 54 +++++++++++----------- 2 files changed, 43 insertions(+), 38 deletions(-) (limited to 'js') 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 d34968e5..218105a7 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.css +++ b/js/components/tools-properties/text-properties.reel/text-properties.css @@ -7,6 +7,10 @@ .optionsTextTool { } +.optionsTextTool .overrideMargin{ + margin-left: 0px; +} + .optionsTextTool .btnGroup { padding: 0px 8px; } @@ -15,26 +19,27 @@ margin: 2px; } -.optionsTextTool > *, .optionsTextTool .btnGroup > * { - float:left; +.optionsTextTool .btnGroup .textButton { + width: auto; + padding: 4px 8px; + margin-left: 0px; } -.optionsTextTool button { - width: auto; - padding: 4px 8px !important; - margin-left:4px; +.optionsTextTool .btnGroup .imageButton { + padding-top: 2px; + height: 22px; } .optionsTextTool .label, .optionsTextTool .hottextunit { font-size:11px; + margin-top: 1px; } .optionsTextTool .fontSelection { - width:100px; + width: 160px; } -.optionsTextTool .fontColor { - width: 20px; - height: 18px; - margin: 2px 6px; +.optionsTextTool .toolColorChipCtrl { + margin-left: 6px; + margin-right: 0px; } \ No newline at end of file diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index 8839ae94..725e1d22 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html @@ -160,8 +160,8 @@ "pressedClass": "active", "preventFocus": true, "identifier": "alignLeft", - "pressedLabel": "Left", - "unpressedLabel": "Left" + "pressedLabel": "", + "unpressedLabel": "" }, "listeners": [ { @@ -177,8 +177,8 @@ "pressedClass": "active", "preventFocus": true, "identifier": "alignCenter", - "pressedLabel": "Center", - "unpressedLabel": "Center" + "pressedLabel": "", + "unpressedLabel": "" }, "listeners": [ { @@ -194,8 +194,8 @@ "pressedClass": "active", "preventFocus": true, "identifier": "alignRight", - "pressedLabel": "Right", - "unpressedLabel": "Right" + "pressedLabel": "", + "unpressedLabel": "" }, "listeners": [ { @@ -211,8 +211,8 @@ "pressedClass": "active", "preventFocus": true, "identifier": "alignJustify", - "pressedLabel": "Justify", - "unpressedLabel": "Justify" + "pressedLabel": "", + "unpressedLabel": "" }, "listeners": [ { @@ -294,36 +294,36 @@ -
+
- + -
-
- - - - +
+
+ + + +
-
- - - - +
+ + + +
-
- - +
+ +
-
- - +
+ +
-- cgit v1.2.3