From 035c851a955952d0a1c89a7c8a646b674ab3f4f2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 15 May 2012 10:42:41 -0700 Subject: -fixed spacing problem in the tag tool -implemented the new mode radio buttons for the pen tool --- css/ninja.css | 6 ++++++ .../pen-properties.reel/pen-properties.css | 6 ------ .../pen-properties.reel/pen-properties.html | 14 ++++++++++++-- .../tag-properties.reel/tag-properties.html | 2 +- scss/imports/scss/_Tools.scss | 14 ++++++++++++++ 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/css/ninja.css b/css/ninja.css index 6b3c00d6..33ec332c 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -823,6 +823,12 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .distRightIcon { background-image: url("../images/optionsbar/selection/DistRight.png"); } +.optionsPenTool input.penToolIcon { background-image: url("../images/tools/Tool-Pen.png"); } + +.optionsPenTool input.penPlusToolIcon { background-image: url("../images/optionsbar/pen/penPlus.png"); } + +.optionsPenTool input.penMinusToolIcon { background-image: url("../images/optionsbar/pen/penMinus.png"); } + #toolsPanelContent { width: 40px; } .toolsList { width: 29px; margin: auto; } diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.css b/js/components/tools-properties/pen-properties.reel/pen-properties.css index c6e68195..7f1b0f7f 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.css +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.css @@ -4,9 +4,3 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ - .optionsPenTool { -} - - .optionsPenTool > * { - float:left; -} diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index 324d1070..e720eb84 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html @@ -28,18 +28,28 @@ "prototype": "js/components/tools-properties/pen-properties.reel", "properties": { "element": {"#": "penProperties"}, + + "_penToolRadio": {"#": "penTool"}, + "_penPlusRadio": {"#": "penPlus"}, + "_penMinusRadio": {"#": "penMinus"}, + "_fillColorCtrl": {"#": "fillColorCtrl"}, "_strokeColorCtrl": {"#": "strokeColorCtrl"}, "_strokeSize": {"@": "strokeSizeHT"} } } } - + -

+

+ + + +

+

diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index 7a8f6d87..87f87aff 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html @@ -45,7 +45,7 @@ -

+

diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss index a4deb488..d068fd2e 100755 --- a/scss/imports/scss/_Tools.scss +++ b/scss/imports/scss/_Tools.scss @@ -458,3 +458,17 @@ input[type="radio"]:disabled { background-image: url("../images/optionsbar/selection/DistRight.png"); } +.optionsPenTool { +} + +.optionsPenTool input.penToolIcon { + background-image:url("../images/tools/Tool-Pen.png"); +} + +.optionsPenTool input.penPlusToolIcon { + background-image:url("../images/optionsbar/pen/penPlus.png"); +} + +.optionsPenTool input.penMinusToolIcon { + background-image:url("../images/optionsbar/pen/penMinus.png"); +} -- cgit v1.2.3