Merge branch 'master' into pentool

Conflicts:
	manifest.json

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
 
 #bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; }
 
-.panelContainer { display: block; -webkit-box-orient: vertical; position: relative; }
+.panelContainer { display: -webkit-box; -webkit-box-orient: vertical; position: relative; }
 
 #leftPanelContainer { width: 40px; -webkit-box-align: stretch; -webkit-box-sizing: border-box; margin-left: 2px; }