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/subtool-button.reel/subtool-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/subtool-button.reel/subtool-button.css')
| -rwxr-xr-x | js/components/layout/subtool-button.reel/subtool-button.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/layout/subtool-button.reel/subtool-button.css b/js/components/layout/subtool-button.reel/subtool-button.css index cda505b0..b98941d9 100755 --- a/js/components/layout/subtool-button.reel/subtool-button.css +++ b/js/components/layout/subtool-button.reel/subtool-button.css | |||
| @@ -12,11 +12,11 @@ | |||
| 12 | background: #B2B2B2; | 12 | background: #B2B2B2; |
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | #toolBarButton { | 15 | .toolBarButton { |
| 16 | border: 3px; | 16 | border: 3px; |
| 17 | float: left; | 17 | float: left; |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | #toolBarButton:hover { | 20 | .toolBarButton:hover { |
| 21 | opacity: 1; | 21 | opacity: 1; |
| 22 | } | 22 | } |