aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-14 09:26:31 -0800
committerJohn Mayhew2012-02-14 09:26:31 -0800
commit65cb57d19c7ff0a8b143c40caa4a227b9e7fd87b (patch)
tree6113587f513fe191fb3538bdce1dc4874e583c93 /js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
parentbe18a677863925963551ce3e88a4a4d254f3870c (diff)
parent1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff)
downloadninja-65cb57d19c7ff0a8b143c40caa4a227b9e7fd87b.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss')
-rw-r--r--js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
index 20481fb6..1f63658a 100644
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
@@ -10,7 +10,7 @@ $grey_light: #494949;
10 10
11.cpp_popup 11.cpp_popup
12{ 12{
13 overflow: none; 13 overflow: hidden;
14 font-size: 12px; 14 font-size: 12px;
15 text-shadow: 1px 1px 1px #000; 15 text-shadow: 1px 1px 1px #000;
16 font-family: 'Droid Sans', sans-serif; 16 font-family: 'Droid Sans', sans-serif;
@@ -32,7 +32,7 @@ $grey_light: #494949;
32 text-indent: -9999px; 32 text-indent: -9999px;
33 overflow: hidden; 33 overflow: hidden;
34 float: right; 34 float: right;
35 padding: none; 35 padding: 0;
36 cursor: pointer; 36 cursor: pointer;
37 border: 1px solid transparent; 37 border: 1px solid transparent;
38} 38}