diff options
| author | Jon Reid | 2012-06-25 11:07:33 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-25 11:07:33 -0700 |
| commit | 831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch) | |
| tree | aa6acda9aeddad8f93cae63b955349a442ddf01f /js/components/tools-properties/text-properties.reel/text-properties.css | |
| parent | 82638621ed793fcb37438798363dba151efd9cd2 (diff) | |
| parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
| download | ninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolution: Use both.
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 |