diff options
| author | John Mayhew | 2012-05-07 15:44:18 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 15:44:18 -0700 |
| commit | 33bb9b7e97e9ec3bd664b3e1c3e7297ba8d07ede (patch) | |
| tree | 98baa2648b2fe0a61b91c85e552c4971e02500bc /js/components | |
| parent | 29ad6355ef60cfb3b3fc7f780504f3ed30845883 (diff) | |
| download | ninja-33bb9b7e97e9ec3bd664b3e1c3e7297ba8d07ede.tar.gz | |
more work on making subtool styling/layout consistent
Diffstat (limited to 'js/components')
5 files changed, 22 insertions, 12 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 7f1b0f7f..58b1c1e8 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.css +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.css | |||
| @@ -4,3 +4,10 @@ | |||
| 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 | |||
| 11 | .optionsFillTool > * { | ||
| 12 | float:left; | ||
| 13 | } \ 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 6532907e..abc2e843 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
| @@ -34,9 +34,8 @@ | |||
| 34 | </head> | 34 | </head> |
| 35 | 35 | ||
| 36 | <body> | 36 | <body> |
| 37 | <div id="fillProperties" class="subToolHolderPanel"> | 37 | <div id="fillProperties" class="subToolHolderPanel optionsFillTool"> |
| 38 | <label class="label subOption"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/> Use WebGL</label> | 38 | <input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> |
| 39 | |||
| 40 | <div id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> | 39 | <div id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> |
| 41 | <label class="label"> Materials:</label> | 40 | <label class="label"> Materials:</label> |
| 42 | <div id="fillIcon" class="bucketToolUp" style="float: left;"></div> | 41 | <div id="fillIcon" class="bucketToolUp" style="float: left;"></div> |
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.css b/js/components/tools-properties/selection-properties.reel/selection-properties.css index e3fe1755..1d5eb513 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.css +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.css | |||
| @@ -4,6 +4,10 @@ | |||
| 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 | .selectionProperties { | 7 | .optionsSelectionTool { |
| 8 | margin-top: -6px; | 8 | padding: 6px; |
| 9 | } | ||
| 10 | |||
| 11 | .optionsSelectionTool > * { | ||
| 12 | float:left; | ||
| 9 | } \ No newline at end of file | 13 | } \ No newline at end of file |
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index f0b907af..3d2456c6 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html | |||
| @@ -25,18 +25,18 @@ | |||
| 25 | </head> | 25 | </head> |
| 26 | 26 | ||
| 27 | <body> | 27 | <body> |
| 28 | <div id="selectionProperties" class="subToolHolderPanel"> | 28 | <div id="selectionProperties" class="subToolHolderPanel optionsSelectionTool"> |
| 29 | <label class="label subOption optionLabel"><input id="transformCheck" type="checkbox" name="transformControl" class="checkBoxAlign"/>Transform Controls</label> | 29 | <input id="transformCheck" type="checkbox" name="transformControl" class="nj-skinned"/><label class="label">Transform Controls  </label> |
| 30 | <div id="toolPropertiesPanel-selectionDivOptions"> | 30 | <div id="toolPropertiesPanel-selectionDivOptions"> |
| 31 | <div class="subOption"><div id="topAlign" class="topAlignUp" title="Top Align"></div></div> | 31 | <div class="subOption"><div id="topAlign" class="topAlignUp" title="Top Align"></div></div> |
| 32 | <div class="subOption"><div id="rightAlign" class="rightAlignUp" title="Right Align"></div></div> | 32 | <div class="subOption"><div id="rightAlign" class="rightAlignUp" title="Right Align"></div></div> |
| 33 | <div class="subOption"><div id="bottomAlign" class="bottomAlignUp" title="Bottom Align"></div></div> | 33 | <div class="subOption subOptionSpacer"><div id="bottomAlign" class="bottomAlignUp" title="Bottom Align"></div></div> |
| 34 | <div class="subOption"><div id="vLeft" class="verticalLeftUp" title="Vertical Left"></div></div> | 34 | <div class="subOption "><div id="vLeft" class="verticalLeftUp" title="Vertical Left"></div></div> |
| 35 | <div class="subOption"><div id="vRight" class="verticalRightUp" title="Vertical Right"></div></div> | 35 | <div class="subOption"><div id="vRight" class="verticalRightUp" title="Vertical Right"></div></div> |
| 36 | <div class="subOption"><div id="vCenter" class="verticalCenterUp" title="Vertical Center"></div></div> | 36 | <div class="subOption subOptionSpacer"><div id="vCenter" class="verticalCenterUp" title="Vertical Center"></div></div> |
| 37 | <div class="subOption"><div id="distTop" class="distTopUp" title="Distance Top"></div></div> | 37 | <div class="subOption"><div id="distTop" class="distTopUp" title="Distance Top"></div></div> |
| 38 | <div class="subOption"><div id="distCenter" class="distCenterUp" title="Distance Center"></div></div> | 38 | <div class="subOption"><div id="distCenter" class="distCenterUp" title="Distance Center"></div></div> |
| 39 | <div class="subOption"><div id="distBottom" class="distBottomUp" title="Distance Bottom"></div></div> | 39 | <div class="subOption subOptionSpacer"><div id="distBottom" class="distBottomUp" title="Distance Bottom"></div></div> |
| 40 | <div class="subOption"><div id="distLeft" class="distLeftUp" title="Distance Left"></div></div> | 40 | <div class="subOption"><div id="distLeft" class="distLeftUp" title="Distance Left"></div></div> |
| 41 | <div class="subOption"><div id="distVCenter" class="distVCenterUp" title="Distance Center"></div></div> | 41 | <div class="subOption"><div id="distVCenter" class="distVCenterUp" title="Distance Center"></div></div> |
| 42 | <div class="subOption"><div id="distRight" class="distRightUp" title="Distance Right"></div></div> | 42 | <div class="subOption"><div id="distRight" class="distRightUp" title="Distance Right"></div></div> |
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 3c492e6e..cc3534f2 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html | |||
| @@ -149,7 +149,7 @@ | |||
| 149 | <div id="lineProperties" class="label"></div> | 149 | <div id="lineProperties" class="label"></div> |
| 150 | </div> | 150 | </div> |
| 151 | 151 | ||
| 152 | <label class="label subOption optionLabel"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/>Use WebGL</label> | 152 | <input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> |
| 153 | 153 | ||
| 154 | <label id="materialLabel" class="label">Material:</label> | 154 | <label id="materialLabel" class="label">Material:</label> |
| 155 | <div id="strokeIcon" class="pencilToolUp" style="float: left;"></div> | 155 | <div id="strokeIcon" class="pencilToolUp" style="float: left;"></div> |