diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/layout/tool-button.reel/tool-button.css | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/layout/tool-button.reel/tool-button.css')
| -rwxr-xr-x | js/components/layout/tool-button.reel/tool-button.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/layout/tool-button.reel/tool-button.css b/js/components/layout/tool-button.reel/tool-button.css index 46152424..f9d23f35 100755 --- a/js/components/layout/tool-button.reel/tool-button.css +++ b/js/components/layout/tool-button.reel/tool-button.css | |||
| @@ -14,11 +14,11 @@ | |||
| 14 | background: #B2B2B2; | 14 | background: #B2B2B2; |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | #toolBarButton { | 17 | .toolBarButton { |
| 18 | border: 3px; | 18 | border: 3px; |
| 19 | float: left; | 19 | float: left; |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | #toolBarButton:hover { | 22 | .toolBarButton:hover { |
| 23 | opacity: 1; | 23 | opacity: 1; |
| 24 | } | 24 | } |