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 --- .../ink-bottle-properties.css | 31 ++++++++++++++++------ .../ink-bottle-properties.html | 24 +++++++---------- 2 files changed, 33 insertions(+), 22 deletions(-) (limited to 'js/components/tools-properties/ink-bottle-properties.reel') diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css index a926a0b4..4136339c 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css @@ -4,27 +4,42 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ -.inkBottleProperties input[type="checkbox"].nj-skinned { +.toolOptionsFloatChildren > * { float:left; - margin-top:5px; } -.inkBottleProperties select.nj-skinned { - float:left; - margin:2px 5px 0 0; +.inkBottleOptions { + padding: 6px; +} + +.inkBottleOptions .nj-divider { + margin-left: 16px; + margin-right: 16px; } -.inkBottleProperties label.disabled { +.toolOptionsFloatChildren select.nj-skinned { + margin-top: 2px; +} + +.inkBottleOptions label.disabled { color:#999999; } -.inkBottleProperties label.disabled:hover { +.inkBottleOptions label.disabled:hover { color:#999999; background-color: transparent; cursor:default; } -.inkBottleProperties div.disabled:hover { +.inkBottleOptions div.disabled:hover { background-color: transparent; cursor:default; +} + +.inkBottleOptions .colorCtrlIcon { + width: 20px; + height: 20px; + margin-top: 2px; + -webkit-transform: scale(0.8); + background-color: rgb(40, 40, 40); } \ No newline at end of file diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index 010e77b2..148c71e3 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html @@ -159,9 +159,8 @@ -
- -
+
+
@@ -181,25 +180,22 @@
-
 
+
 
-
+
-
- +
+ + -
+
-
- +
+
-- cgit v1.2.3