CodeMirror and Pretty Print issues with error dots in the editor and tooltips getting cut off

2 files changed, 11 insertions, 2 deletions

diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 5bc6a7a43..14fa54696 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -710,7 +710,8 @@ function(app, FauxtonAPI, Paginate, Documents, pouchdb, Codemirror, JSHint, resi
 
           setTimeout(function() {
             $(".CodeMirror ."+className).tooltip({
-              title: "ERROR: " + error.reason
+              title: "ERROR: " + error.reason,
+              container: 'body'
             });
           }, 0);
         }, this);
diff --git a/src/fauxton/assets/less/prettyprint.less b/src/fauxton/assets/less/prettyprint.less
index 8ed512c0c..7925fa72a 100644
--- a/src/fauxton/assets/less/prettyprint.less
+++ b/src/fauxton/assets/less/prettyprint.less
@@ -35,4 +35,12 @@ pre.prettyprint {
   .com {
     color: #666;
   }
-}
\ No newline at end of file
+}
+.CodeMirror-wrap pre{
+  &.view-code-error{
+    color: @darkRed;
+  }
+  .tooltip{
+    z-index: 100000000;
+  }
+}