From 4900fa2f9fa16501053075393af185dc8d349159 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Thu, 17 Mar 2011 21:50:03 +0000
Subject: [PATCH] a ton of fixes to make cockpit look good in ace, or at least
 not totally borked

---
 demo/styles.css | 3 +--
 support/cockpit | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/demo/styles.css b/demo/styles.css
index 3f244f7c..1833a277 100644
--- a/demo/styles.css
+++ b/demo/styles.css
@@ -37,11 +37,10 @@ body {
 }
 
 #cockpitOutput {
-    padding: 10px;
     margin: 0 15px;
     border: 1px solid #AAA;
     -moz-border-radius-topleft: 10px;
     -moz-border-radius-topright: 10px;
     border-top-left-radius: 4px; border-top-right-radius: 4px;
     background: #DDD; color: #000;
-}
\ No newline at end of file
+}
diff --git a/support/cockpit b/support/cockpit
index 56a7887f..f825fa7d 160000
--- a/support/cockpit
+++ b/support/cockpit
@@ -1 +1 @@
-Subproject commit 56a7887f269e31e2bf96cb3bf85d5ac9373111c6
+Subproject commit f825fa7dff437fa488c5e291fff37a95f44e4513