diff options
author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
tree | eb5585f92061975215f6d19305a8d1b76262e2fc /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css | |
parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css')
-rwxr-xr-x | js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css | 15 |
1 files changed, 0 insertions, 15 deletions
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 3dba17b6..dae64eb3 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 | |||
@@ -8,18 +8,3 @@ | |||
8 | .inkBottleOptions select.nj-skinned { | 8 | .inkBottleOptions select.nj-skinned { |
9 | margin-top: 2px; | 9 | margin-top: 2px; |
10 | } | 10 | } |
11 | |||
12 | .inkBottleOptions label.disabled { | ||
13 | color:#999999; | ||
14 | } | ||
15 | |||
16 | .inkBottleOptions label.disabled:hover { | ||
17 | color:#999999; | ||
18 | background-color: transparent; | ||
19 | cursor:default; | ||
20 | } | ||
21 | |||
22 | .inkBottleOptions div.disabled:hover { | ||
23 | background-color: transparent; | ||
24 | cursor:default; | ||
25 | } | ||