diff options
author | hwc487 | 2012-03-24 14:07:58 -0700 |
---|---|---|
committer | hwc487 | 2012-03-24 14:07:58 -0700 |
commit | cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2 (patch) | |
tree | 4f5c42f0a1df00dcd1a2064dd176fcff7930ba47 | |
parent | 62f4327f9b83760e52a1f6bf1e689b1e0a780fbb (diff) | |
parent | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff) | |
download | ninja-cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2.tar.gz |
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into Textures
97 files changed, 3776 insertions, 533 deletions
diff --git a/css/ninja.css b/css/ninja.css index 8213ec26..2f3be9ce 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -707,10 +707,6 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul | |||
707 | 707 | ||
708 | .subToolPropertiespanel { margin-left: 43px; } | 708 | .subToolPropertiespanel { margin-left: 43px; } |
709 | 709 | ||
710 | .LockToolUp { background-image: url("../images/optionsbar/link.png"); background-repeat: no-repeat; width: 17px; height: 18px; margin-right: 10px; } | ||
711 | |||
712 | .UnLockToolUp { background-image: url("../images/optionsbar/unlinked.png"); background-repeat: no-repeat; width: 17px; height: 18px; margin-right: 10px; } | ||
713 | |||
714 | .cornerRadius { background-image: url("../images/optionsbar/rectangle/cornerRadius.png"); background-repeat: no-repeat; width: 16px; height: 16px; opacity: 0.7; } | 710 | .cornerRadius { background-image: url("../images/optionsbar/rectangle/cornerRadius.png"); background-repeat: no-repeat; width: 16px; height: 16px; opacity: 0.7; } |
715 | 711 | ||
716 | .cornerRadius:hover, .cornerRadius:active { opacity: 1; } | 712 | .cornerRadius:hover, .cornerRadius:active { opacity: 1; } |
diff --git a/js/components/button.reel/button.css b/js/components/button.reel/button.css deleted file mode 100755 index f50a9873..00000000 --- a/js/components/button.reel/button.css +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | .button { | ||
8 | border:none; | ||
9 | cursor:default; | ||
10 | text-align:center; | ||
11 | -webkit-user-select:none; | ||
12 | opacity:0.8; | ||
13 | display:table-cell; | ||
14 | vertical-align:middle; | ||
15 | width:100%; | ||
16 | height:100%; | ||
17 | background-color:#333333; | ||
18 | color:white; | ||
19 | } | ||
20 | |||
21 | .button:hover | ||
22 | { | ||
23 | opacity:1; | ||
24 | } | ||
25 | |||
26 | .button:active | ||
27 | { | ||
28 | outline:solid 1px black; | ||
29 | } | ||
30 | |||
31 | .button.on | ||
32 | { | ||
33 | background-color: #333333; | ||
34 | } | ||
35 | |||
36 | .button.off | ||
37 | { | ||
38 | background-color: #cccccc; | ||
39 | color:black; | ||
40 | } \ No newline at end of file | ||
diff --git a/js/components/button.reel/button.html b/js/components/button.reel/button.html deleted file mode 100755 index d0398a6a..00000000 --- a/js/components/button.reel/button.html +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Re |