diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/layout/subtool-button.reel | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/layout/subtool-button.reel')
| -rwxr-xr-x | js/components/layout/subtool-button.reel/subtool-button.css | 4 | ||||
| -rwxr-xr-x | js/components/layout/subtool-button.reel/subtool-button.html | 2 |
2 files changed, 3 insertions, 3 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 | } |
diff --git a/js/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html index 501193d3..30f75d8c 100755 --- a/js/components/layout/subtool-button.reel/subtool-button.html +++ b/js/components/layout/subtool-button.reel/subtool-button.html | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | </head> | 24 | </head> |
| 25 | 25 | ||
| 26 | <body> | 26 | <body> |
| 27 | <div id="toolButton" class="toolbutton"></div> | 27 | <div data-montage-id="toolButton" class="toolbutton"></div> |
| 28 | </body> | 28 | </body> |
| 29 | 29 | ||
| 30 | </html> | 30 | </html> |