Merge branch 'refs/heads/Ninja-Internal' into Document

2 files changed, 3 insertions, 3 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 218105a7..586cdcd5 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -39,7 +39,7 @@
     width: 160px;
 }
 
-.optionsTextTool .toolColorChipCtrl {
-    margin-left: 6px;
+.fontColorChipContainer {
+    margin-left: 10px !important;
     margin-right: 0px;
 }
\ No newline at end of file
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index e7fafd0d..f47ca0c8 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -290,7 +290,7 @@
             <button data-montage-id="fontSettings" style="display: none"></button>
             <label class="label">Size:</label>
             <select data-montage-id="fontSize" class="nj-skinned"></select>
-            <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer fontColorChipContainer"><div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div></div>
             <div class="btnGroup toolOptionsFloatChildren">
                 <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button>
                 <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button>