Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internal

Conflicts:
	js/components/tools-properties/text-properties.reel/text-properties.js

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

1 files changed, 4 insertions, 0 deletions

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index 60317304..9e562f68 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -63,6 +63,10 @@ POSSIBILITY OF SUCH DAMAGE.
     width: 160px;
 }
 
+.optionsTextTool .montage-button:hover {
+    color:#FFF;
+}
+
 .fontColorChipContainer {
     margin-left: 10px !important;
     margin-right: 0px;