From 9f0754eb0c619e9e33df707f24eed1dd6ae95096 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 14:48:28 -0700 Subject: implemented proper styling for shape, inkbottle and fill tools make all icons for fill and stroke use the proper classes/images --- .../fill-properties.reel/fill-properties.css | 26 ++++++++++++++++++++-- .../fill-properties.reel/fill-properties.html | 9 ++++---- 2 files changed, 29 insertions(+), 6 deletions(-) (limited to 'js/components/tools-properties/fill-properties.reel') 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 @@ .optionsFillTool { padding: 6px; } - - .optionsFillTool > * { +.optionsFillTool > * { + float:left; +} +.optionsFillTool > * > *{ float:left; +} + +.optionsFillTool label { + margin-right: 8px; +} +.optionsFillTool .colorCtrlIcon { + width: 20px; + height: 20px; + margin-top: 0px; + margin-left: 10px; + -webkit-transform: scale(0.8); + background-color: rgb(40, 40, 40); +} + +.materialsContainerOptions select { + margin-top: 2px; +} + +.materialsContainerOptions label { + margin-right: 0px; } \ 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 @@

- Use WebGL -

- Materials: -

+ + Use WebGL +

+ Material: +

-- cgit v1.2.3