diff options
author | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
commit | 63307c9abf120985d979a40a53a0598d3f0d5c5a (patch) | |
tree | 57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /css | |
parent | e1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff) | |
parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
download | ninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz |
Merge branch 'master' into pentool
Conflicts:
manifest.json
Diffstat (limited to 'css')
-rwxr-xr-x | css/ninja.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/css/ninja.css b/css/ninja.css index f085f6be..7baf4204 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -82,7 +82,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
82 | 82 | ||
83 | #bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; } | 83 | #bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; } |
84 | 84 | ||
85 | .panelContainer { display: block; -webkit-box-orient: vertical; position: relative; } | 85 | .panelContainer { display: -webkit-box; -webkit-box-orient: vertical; position: relative; } |
86 | 86 | ||
87 | #leftPanelContainer { width: 40px; -webkit-box-align: stretch; -webkit-box-sizing: border-box; margin-left: 2px; } | 87 | #leftPanelContainer { width: 40px; -webkit-box-align: stretch; -webkit-box-sizing: border-box; margin-left: 2px; } |
88 | 88 | ||