diff options
| author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
| commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
| tree | 762d98ba8852b858c03760f4b9bef294fae6486c /js/components/treeview/ninja-leaf.reel/ninja-leaf.css | |
| parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
| parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
| download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/treeview/ninja-leaf.reel/ninja-leaf.css')
| -rw-r--r-- | js/components/treeview/ninja-leaf.reel/ninja-leaf.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css index 085b11e0..fedc1d9d 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | /* Second level */ | 19 | /* Second level */ |
| 20 | .branch .branch .leaf-label { | 20 | .branch .branch .leaf-label { |
| 21 | background-position: 25px center; | 21 | background-position: 25px center; |
| 22 | box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2); | ||
| 23 | color: #FFF; | 22 | color: #FFF; |
| 24 | padding-left: 45px; | 23 | padding-left: 45px; |
| 25 | } | 24 | } |