diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/colorwheel.reel/css | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/colorwheel.reel/css')
| -rwxr-xr-x | js/components/colorwheel.reel/css/colorwheel.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/colorwheel.reel/css/colorwheel.scss b/js/components/colorwheel.reel/css/colorwheel.scss index d5455c0f..a4b0807f 100755 --- a/js/components/colorwheel.reel/css/colorwheel.scss +++ b/js/components/colorwheel.reel/css/colorwheel.scss | |||
| @@ -31,11 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 31 | 31 | ||
| 32 | .colorwheel | 32 | .colorwheel |
| 33 | { | 33 | { |
| 34 | position: relative; | 34 | position: relative; |
| 35 | overflow: hidden; | 35 | overflow: hidden; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | .colorwheel canvas | 38 | .colorwheel canvas |
| 39 | { | 39 | { |
| 40 | position: absolute; | 40 | position: absolute; |
| 41 | } | 41 | } |