diff options
author | Armen Kesablyan | 2012-06-21 14:33:01 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-21 14:33:01 -0700 |
commit | 9fe9bc495af74d963fa7061d4d1a479720133a56 (patch) | |
tree | eca4b0d785ad28483904682b7fdfdb9686fc3d1a /js/components/tools-properties/text-properties.reel | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
parent | c411f76d89c543837548085ff468fee0fb4f2ff9 (diff) | |
download | ninja-9fe9bc495af74d963fa7061d4d1a479720133a56.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/components/tools-properties/text-properties.reel')
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.css | 4 | ||||
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.html | 2 |
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 @@ | |||
39 | width: 160px; | 39 | width: 160px; |
40 | } | 40 | } |
41 | 41 | ||
42 | .optionsTextTool .toolColorChipCtrl { | 42 | .fontColorChipContainer { |
43 | margin-left: 6px; | 43 | margin-left: 10px !important; |
44 | margin-right: 0px; | 44 | margin-right: 0px; |
45 | } \ No newline at end of file | 45 | } \ 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 a353752f..8899ff3c 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -285,7 +285,7 @@ | |||
285 | <button data-montage-id="fontSettings" style="display: none"></button> | 285 | <button data-montage-id="fontSettings" style="display: none"></button> |
286 | <label class="label">Size:</label> | 286 | <label class="label">Size:</label> |
287 | <select data-montage-id="fontSize" class="nj-skinned"></select> | 287 | <select data-montage-id="fontSize" class="nj-skinned"></select> |
288 | <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div> | 288 | <div class="toolColorChipContainer fontColorChipContainer"><div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div></div> |
289 | <div class="btnGroup toolOptionsFloatChildren"> | 289 | <div class="btnGroup toolOptionsFloatChildren"> |
290 | <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button> | 290 | <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button> |
291 | <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button> | 291 | <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button> |