diff options
| author | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
| commit | d9f9a65226dfe26500e82061cc38a7dda302f720 (patch) | |
| tree | 32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/components/tools-properties/text-properties.reel/text-properties.css | |
| parent | 1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff) | |
| parent | 9fe9bc495af74d963fa7061d4d1a479720133a56 (diff) | |
| download | ninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/hintable.reel/hintable.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.css')
| -rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.css | 4 |
1 files changed, 2 insertions, 2 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 |