diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/color/colorpanelpopup.reel/css | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel/css')
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css | 2 | ||||
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css index 4db0abff..3ffcd2f5 100755 --- a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css +++ b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css | |||
@@ -56,7 +56,7 @@ | |||
56 | 56 | ||
57 | /* line 62, colorpanelpopup.scss */ | 57 | /* line 62, colorpanelpopup.scss */ |
58 | .cp_pu_palettes { | 58 | .cp_pu_palettes { |
59 | background: #000; | 59 | background: url(../img/icon_palette.jpg) no-repeat black -1px -1px; |
60 | } | 60 | } |
61 | 61 | ||
62 | /* line 67, colorpanelpopup.scss */ | 62 | /* line 67, colorpanelpopup.scss */ |
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 |