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-branch.reel/ninja-branch.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-branch.reel/ninja-branch.css')
| -rw-r--r-- | js/components/treeview/ninja-branch.reel/ninja-branch.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css index d8c212e8..340233c7 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.css +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | cursor: pointer; | 26 | cursor: pointer; |
| 27 | font-weight: bold; | 27 | font-weight: bold; |
| 28 | padding: 3px 0 4px; | 28 | padding: 3px 0 4px; |
| 29 | text-shadow: 1px 1px 0 #000; | ||
| 30 | } | 29 | } |
| 31 | 30 | ||
| 32 | /* First Level */ | 31 | /* First Level */ |