Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 760af55b..4c464173 100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -21,6 +21,7 @@ exports.TextTool = Montage.create(DrawingTool, {
                 this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value;
                 this.application.ninja.stage.textTool.value = "";
                 this.application.ninja.stage.textTool.element.style.display = "none";
+                this.applyElementStyles(this.application.ninja.stage.textTool.element.firstChild, this.selectedElement, ["color"]);
             }
             //Set Selected Element
             this._selectedElement = val;