Merge branch 'refs/heads/master' into element-model-fixes

Conflicts:
	js/mediators/element-mediator.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

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 @@
 .inkBottleOptions select.nj-skinned {
         margin-top: 2px;
 }
-
-.inkBottleOptions label.disabled {
-    color:#999999;
-}
-
-.inkBottleOptions label.disabled:hover {
-    color:#999999;
-    background-color: transparent;
-    cursor:default;
-}
-
-.inkBottleOptions div.disabled:hover {
-    background-color: transparent;
-    cursor:default;
-}