diff options
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel')
3 files changed, 7 insertions, 31 deletions
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 @@ | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | .optionsShapeTool { | ||
| 8 | padding: 6px; | ||
| 9 | } | ||
| 10 | |||
| 11 | .optionsShapeTool > * { | ||
| 12 | float:left; | ||
| 13 | } | ||
| 14 | |||
| 15 | .optionsShapeTool select.nj-skinned { | 7 | .optionsShapeTool select.nj-skinned { |
| 16 | margin-top: 2px; | 8 | margin-top: 2px; |
| 17 | } | 9 | } |
| @@ -21,21 +13,6 @@ | |||
| 21 | margin-left: -31px; | 13 | margin-left: -31px; |
| 22 | } | 14 | } |
| 23 | 15 | ||
| 24 | .optionsShapeTool .fillColorCtrl, .optionsShapeTool .strokeColorCtrl { | ||
| 25 | width: 20px; | ||
| 26 | height: 18px; | ||
| 27 | margin: 1px 6px; | ||
| 28 | border: 1px black solid; | ||
| 29 | } | ||
| 30 | |||
| 31 | .optionsShapeTool .colorCtrlIcon { | ||
| 32 | width: 20px; | ||
| 33 | height: 20px; | ||
| 34 | margin-top: 2px; | ||
| 35 | -webkit-transform: scale(0.8); | ||
| 36 | background-color: rgb(40, 40, 40); | ||
| 37 | } | ||
| 38 | |||
| 39 | .optionsShapeTool checkbox { | 16 | .optionsShapeTool checkbox { |
| 40 | padding: 6px; | 17 | padding: 6px; |
| 41 | } | 18 | } |
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 @@ | |||
| 132 | </head> | 132 | </head> |
| 133 | 133 | ||
| 134 | <body> | 134 | <body> |
| 135 | <div data-montage-id="shapeProperties" class="subToolHolderPanel optionsShapeTool"> | 135 | <div data-montage-id="shapeProperties" class="subToolHolderPanel optionsShapeTool toolOptionsFloatChildren"> |
| 136 | <div data-montage-id="shapeToolsList"> | 136 | <div data-montage-id="shapeToolsList"> |
| 137 | <div data-montage-id="toolbutton"></div> | 137 | <div data-montage-id="toolbutton"></div> |
| 138 | </div> | 138 | </div> |
| 139 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | 139 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
| 140 | <div class="colorCtrlIcon PencilTool"></div> | 140 | <div class="toolColorChipIcon PencilTool"></div> |
| 141 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> | 141 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> |
| 142 | <div data-montage-id="fillColorCtrlIcon" class="colorCtrlIcon FillTool"></div> | 142 | <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div> |
| 143 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> | 143 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> |
| 144 | <div class="nj-divider divider-vertical"> </div> | 144 | <div class="nj-divider divider-vertical"> </div> |
| 145 | <label class="label">Stroke:</label> | 145 | <label class="label">Stroke:</label> |
| 146 | <div data-montage-id="strokeControl" class="label"></div> | 146 | <div data-montage-id="strokeControl" class="label"></div> |
| @@ -153,12 +153,12 @@ | |||
| 153 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> | 153 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> |
| 154 | 154 | ||
| 155 | <label data-montage-id="materialLabel" class="label">Material:</label> | 155 | <label data-montage-id="materialLabel" class="label">Material:</label> |
| 156 | <div data-montage-id="strokeIcon" class="colorCtrlIcon PencilTool"></div> | 156 | <div data-montage-id="strokeIcon" class="toolColorChipIcon PencilTool"></div> |
| 157 | 157 | ||
| 158 | <select class="selectBox" data-montage-id="strokeMaterialCB"> | 158 | <select class="selectBox" data-montage-id="strokeMaterialCB"> |
| 159 | </select> | 159 | </select> |
| 160 | 160 | ||
| 161 | <div data-montage-id="fillIcon" class="colorCtrlIcon FillTool"></div> | 161 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> |
| 162 | <select class="selectBox" data-montage-id="fillMaterialCB"> | 162 | <select class="selectBox" data-montage-id="fillMaterialCB"> |
| 163 | </select> | 163 | </select> |
| 164 | 164 | ||
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, { | |||
| 16 | _fill: { | 16 | _fill: { |
| 17 | enumerable: false, | 17 | enumerable: false, |
| 18 | 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] } | 18 | 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] } |
| 19 | //this._fillColorCtrl.color('nocolor', null); | ||
| 20 | }, | 19 | }, |
| 21 | 20 | ||
| 22 | _stroke: { | 21 | _stroke: { |