diff options
| author | John Mayhew | 2012-05-09 18:07:32 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-09 18:07:32 -0700 |
| commit | 18370abcf406c6ab36d5c5f2613cb79e756ff6d2 (patch) | |
| tree | 7c1c75a974dc593f73149770f94c8d746eb4926f /js/components/tools-properties/fill-properties.reel | |
| parent | 7dd942b6e19d2d7a779bc50e7bf4c8f8780b8f3a (diff) | |
| download | ninja-18370abcf406c6ab36d5c5f2613cb79e756ff6d2.tar.gz | |
-Consolidated many redundant css classes used in the tool options bars
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.css | 23 | ||||
| -rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.html | 6 |
2 files changed, 4 insertions, 25 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.css b/js/components/tools-properties/fill-properties.reel/fill-properties.css index fa2e75e6..606e73b3 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.css +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.css | |||
| @@ -4,32 +4,11 @@ | |||
| 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 | .optionsFillTool { | ||
| 8 | padding: 6px; | ||
| 9 | } | ||
| 10 | .optionsFillTool > * { | ||
| 11 | float:left; | ||
| 12 | } | ||
| 13 | .optionsFillTool > * > *{ | ||
| 14 | float:left; | ||
| 15 | } | ||
| 16 | |||
| 17 | .optionsFillTool label { | ||
| 18 | margin-right: 8px; | ||
| 19 | } | ||
| 20 | .optionsFillTool .colorCtrlIcon { | ||
| 21 | width: 20px; | ||
| 22 | height: 20px; | ||
| 23 | margin-top: 0px; | ||
| 24 | margin-left: 10px; | ||
| 25 | -webkit-transform: scale(0.8); | ||
| 26 | background-color: rgb(40, 40, 40); | ||
| 27 | } | ||
| 28 | 7 | ||
| 29 | .materialsContainerOptions select { | 8 | .materialsContainerOptions select { |
| 30 | margin-top: 2px; | 9 | margin-top: 2px; |
| 31 | } | 10 | } |
| 32 | 11 | ||
| 33 | .materialsContainerOptions label { | 12 | .materialsContainerOptions label { |
| 34 | margin-right: 0px; | 13 | margin-right: 3px; |
| 35 | } \ No newline at end of file | 14 | } \ No newline at end of file |
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index 9fb84a1b..975b4e6f 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
| @@ -34,12 +34,12 @@ | |||
| 34 | </head> | 34 | </head> |
| 35 | 35 | ||
| 36 | <body> | 36 | <body> |
| 37 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool"> | 37 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> |
| 38 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/> | 38 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/> |
| 39 | <label class="label">Use WebGL</label> | 39 | <label class="label">Use WebGL</label> |
| 40 | <div data-montage-id="materialsContainer" class="materialsContainerOptions"> | 40 | <div data-montage-id="materialsContainer" class="materialsContainerOptions toolOptionsFloatChildren"> |
| 41 | <label class="label">Material:</label> | 41 | <label class="label">Material:</label> |
| 42 | <div data-montage-id="fillIcon" class="colorCtrlIcon FillTool"></div> | 42 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> |
| 43 | <select data-montage-id="fillMaterialCB" class="nj-skinned"> | 43 | <select data-montage-id="fillMaterialCB" class="nj-skinned"> |
| 44 | </select> | 44 | </select> |
| 45 | </div> | 45 | </div> |