diff options
author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
tree | de7b50f2d02365df897ef4356f953d3833c9cabd /js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css | |
parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 | } |