diff options
author | hwc487 | 2012-06-14 16:20:01 -0700 |
---|---|---|
committer | hwc487 | 2012-06-14 16:20:01 -0700 |
commit | 2bcc1d3c6c1e31f5ca4310c581602bfa8b8a1265 (patch) | |
tree | 54f8fb15e1f073f159e577af8324a447789d7a64 /js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss | |
parent | f0fc7a5678093cce986bd99fef2c5c88add19b68 (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-2bcc1d3c6c1e31f5ca4310c581602bfa8b8a1265.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss')
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss index 1f63658a..cd9f47a2 100755 --- a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss +++ b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss | |||
@@ -60,7 +60,7 @@ $grey_light: #494949; | |||
60 | 60 | ||
61 | .cp_pu_palettes | 61 | .cp_pu_palettes |
62 | { | 62 | { |
63 | background: #000; | 63 | background: url(../img/icon_palette.jpg) no-repeat #000 -1px -1px; |
64 | } | 64 | } |
65 | 65 | ||
66 | .cp_pu_nocolor | 66 | .cp_pu_nocolor |