diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css')
| -rw-r--r-- | js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css | 4 |
1 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 6a418279..4db0abff 100644 --- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css +++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | </copyright> */ | 6 | </copyright> */ |
| 7 | /* line 12, colorpanelpopup.scss */ | 7 | /* line 12, colorpanelpopup.scss */ |
| 8 | .cpp_popup { | 8 | .cpp_popup { |
| 9 | overflow: none; | 9 | overflow: hidden; |
| 10 | font-size: 12px; | 10 | font-size: 12px; |
| 11 | text-shadow: 1px 1px 1px #000; | 11 | text-shadow: 1px 1px 1px #000; |
| 12 | font-family: 'Droid Sans', sans-serif; | 12 | font-family: 'Droid Sans', sans-serif; |
| @@ -28,7 +28,7 @@ | |||
| 28 | text-indent: -9999px; | 28 | text-indent: -9999px; |
| 29 | overflow: hidden; | 29 | overflow: hidden; |
| 30 | float: right; | 30 | float: right; |
| 31 | padding: none; | 31 | padding: 0; |
| 32 | cursor: pointer; | 32 | cursor: pointer; |
| 33 | border: 1px solid transparent; | 33 | border: 1px solid transparent; |
| 34 | } | 34 | } |