diff options
| author | John Mayhew | 2012-05-08 14:48:28 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-08 14:48:28 -0700 |
| commit | 9f0754eb0c619e9e33df707f24eed1dd6ae95096 (patch) | |
| tree | 117518819c4ef0529052de8f124017cd7d010b93 /js/components/tools-properties/fill-properties.reel | |
| parent | 3ae45590d320b4e13367f78f821b7abcd9dbc53a (diff) | |
| download | ninja-9f0754eb0c619e9e33df707f24eed1dd6ae95096.tar.gz | |
implemented proper styling for shape, inkbottle and fill tools
make all icons for fill and stroke use the proper classes/images
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.css | 26 | ||||
| -rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.html | 9 |
2 files changed, 29 insertions, 6 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 58b1c1e8..fa2e75e6 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.css +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.css | |||
| @@ -7,7 +7,29 @@ | |||
| 7 | .optionsFillTool { | 7 | .optionsFillTool { |
| 8 | padding: 6px; | 8 | padding: 6px; |
| 9 | } | 9 | } |
| 10 | 10 | .optionsFillTool > * { | |
| 11 | .optionsFillTool > * { | 11 | float:left; |
| 12 | } | ||
| 13 | .optionsFillTool > * > *{ | ||
| 12 | float:left; | 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 | |||
| 29 | .materialsContainerOptions select { | ||
| 30 | margin-top: 2px; | ||
| 31 | } | ||
| 32 | |||
| 33 | .materialsContainerOptions label { | ||
| 34 | margin-right: 0px; | ||
| 13 | } \ No newline at end of file | 35 | } \ 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 fb59e2a8..9fb84a1b 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
| @@ -35,10 +35,11 @@ | |||
| 35 | 35 | ||
| 36 | <body> | 36 | <body> |
| 37 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool"> | 37 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool"> |
| 38 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> | 38 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/> |
| 39 | <div data-montage-id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> | 39 | <label class="label">Use WebGL</label> |
| 40 | <label class="label"> Materials:</label> | 40 | <div data-montage-id="materialsContainer" class="materialsContainerOptions"> |
| 41 | <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div> | 41 | <label class="label">Material:</label> |
| 42 | <div data-montage-id="fillIcon" class="colorCtrlIcon FillTool"></div> | ||
| 42 | <select data-montage-id="fillMaterialCB" class="nj-skinned"> | 43 | <select data-montage-id="fillMaterialCB" class="nj-skinned"> |
| 43 | </select> | 44 | </select> |
| 44 | </div> | 45 | </div> |