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. --- .../tools-properties/oval-properties.reel/oval-properties.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'js/components/tools-properties/oval-properties.reel') diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js index ddeb64ee..3edd9214 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.js +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js @@ -24,6 +24,14 @@ exports.OvalProperties = Montage.create(ToolProperties, { }, // Public API + fill: { + get: function () { return this.base.fill; } + }, + + stroke: { + get: function () { return this.base.stroke; } + }, + use3D: { get: function() { return this.base._use3D; } }, -- 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/oval-properties.reel/oval-properties.css | 11 +++++++++++ .../oval-properties.reel/oval-properties.html | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'js/components/tools-properties/oval-properties.reel') diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css index 7f1b0f7f..ea0d92fc 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.css +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css @@ -4,3 +4,14 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ +.ovalProperties{ +} + +.ovalProperties hottextunit { + width: 22px; +} + +.ovalProperties label { + margin-left: 6px; + margin-right: 6px; +} diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html index c76e8c39..21308be6 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.html +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html @@ -35,9 +35,9 @@ -
- -
+
+ +
-- cgit v1.2.3