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 ---------------------- .../shape-properties.reel/shape-properties.html | 14 ++++++------- .../shape-properties.reel/shape-properties.js | 1 - 3 files changed, 7 insertions(+), 31 deletions(-) (limited to 'js/components/tools-properties/shape-properties.reel') 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. */ - .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; } diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index c54f8b25..c6aa0c94 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html @@ -132,15 +132,15 @@ -

Stroke:

@@ -153,12 +153,12 @@ Use WebGL Material: -

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js index 74875544..23158493 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.js +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js @@ -16,7 +16,6 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, { _fill: { enumerable: false, value: { colorMode: 'rgb', color: { r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [1, 1, 1, 1] } - //this._fillColorCtrl.color('nocolor', null); }, _stroke: { -- cgit v1.2.3