diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/components/layout/tool-button.reel/tool-button.css | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 | } |