diff options
| author | hwc487 | 2012-02-21 17:02:31 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-21 17:02:31 -0800 |
| commit | f06f44ab3fcca109f126eae4f6fb915c5dd28791 (patch) | |
| tree | c25fbfedf93c135be53f1e9238f7ddcf498612bc /js/components/tools-properties/rect-properties.reel | |
| parent | bd7bc833895391e4974b8746f31f63ba70689df3 (diff) | |
| parent | d2f4d5e5f6742d53b6324d585a700566f73c992a (diff) | |
| download | ninja-f06f44ab3fcca109f126eae4f6fb915c5dd28791.tar.gz | |
Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integration
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.css | 12 | ||||
| -rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.html | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css index f50a9873..6541f641 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.css +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | .button { | 7 | .rectProperties .button { |
| 8 | border:none; | 8 | border:none; |
| 9 | cursor:default; | 9 | cursor:default; |
| 10 | text-align:center; | 10 | text-align:center; |
| @@ -12,28 +12,26 @@ | |||
| 12 | opacity:0.8; | 12 | opacity:0.8; |
| 13 | display:table-cell; | 13 | display:table-cell; |
| 14 | vertical-align:middle; | 14 | vertical-align:middle; |
| 15 | width:100%; | ||
| 16 | height:100%; | ||
| 17 | background-color:#333333; | 15 | background-color:#333333; |
| 18 | color:white; | 16 | color:white; |
| 19 | } | 17 | } |
| 20 | 18 | ||
| 21 | .button:hover | 19 | .rectProperties .button:hover |
| 22 | { | 20 | { |
| 23 | opacity:1; | 21 | opacity:1; |
| 24 | } | 22 | } |
| 25 | 23 | ||
| 26 | .button:active | 24 | .rectProperties .button:active |
| 27 | { | 25 | { |
| 28 | outline:solid 1px black; | 26 | outline:solid 1px black; |
| 29 | } | 27 | } |
| 30 | 28 | ||
| 31 | .button.on | 29 | .rectProperties .button.on |
| 32 | { | 30 | { |
| 33 | background-color: #333333; | 31 | background-color: #333333; |
| 34 | } | 32 | } |
| 35 | 33 | ||
| 36 | .button.off | 34 | .rectProperties .button.off |
| 37 | { | 35 | { |
| 38 | background-color: #cccccc; | 36 | background-color: #cccccc; |
| 39 | color:black; | 37 | color:black; |
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html index e5c52466..214ff1d5 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html | |||
| @@ -68,7 +68,7 @@ | |||
| 68 | </head> | 68 | </head> |
| 69 | 69 | ||
| 70 | <body> | 70 | <body> |
| 71 | <div id="rectProperties"> | 71 | <div id="rectProperties" class="rectProperties"> |
| 72 | <button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button> | 72 | <button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button> |
| 73 | <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> | 73 | <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> |
| 74 | <div id="TLRadiusControl" class="label"></div> | 74 | <div id="TLRadiusControl" class="label"></div> |