diff options
author | Armen Kesablyan | 2012-02-14 10:09:48 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-14 10:09:48 -0800 |
commit | ace16ef22b3ff32663504df7720af481d76987d6 (patch) | |
tree | b223da744577290b00fb454177738369b3a3894a /js/panels/Color/colorpanelpopup.reel | |
parent | 90d0c8c0e98d062c628c061fe5765ce991fda409 (diff) | |
parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
download | ninja-ace16ef22b3ff32663504df7720af481d76987d6.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/Color/colorpanelpopup.reel')
-rw-r--r-- | js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css | 4 | ||||
-rw-r--r-- | js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss | 4 |
2 files changed, 4 insertions, 4 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 | } |
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 | } |