From 0fb0820c642c4eab1170d0ff6ac3ef499d4ed2b3 Mon Sep 17 00:00:00 2001
From: Arun Kollan <arun.kollan@enterprisedb.com>
Date: Wed, 13 Apr 2016 12:24:46 +0100
Subject: [PATCH] Fix CodeMirror borders on dialogues.

---
 web/pgadmin/static/css/overrides.css      | 22 ++++++++++++++++++++--
 web/pgadmin/static/js/backform.pgadmin.js |  4 ++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css
index 62064229e..7ce0491f3 100755
--- a/web/pgadmin/static/css/overrides.css
+++ b/web/pgadmin/static/css/overrides.css
@@ -277,6 +277,11 @@ iframe {
     padding-right: 3px;
     padding-left: 3px;
 }
+.pgadmin-controls.SQL {
+  min-width: 290px;
+  padding-right: 3px;
+  padding-left: 1px;
+}
 .pgadmin-controls > textarea.form-control,
 .pgadmin-controls > textarea.form-control[disabled] {
    min-width: 100%;
@@ -856,11 +861,20 @@ td.edit-cell.editable.sortable.renderable.editor {
 }
 
 .sql_field_height_300 {
-    height: 300px;
+    height: 340px;
 }
 
 .sql_field_height_400 {
-    height: 400px;
+    height: 440px;
+}
+
+.tab-pane.SQL {
+  padding: 0px 7px 0px 0px;
+}
+
+.pgadmin-control-group.sql {
+  margin: 0px;
+  padding: 0px;
 }
 
 .nav-tabs{
@@ -930,3 +944,7 @@ ul.nav.nav-tabs {
 .pgadmin-control-group span.wcTabIcon {
   padding-left: 20px;
 }
+
+.pgadmin-controls.SQL>.CodeMirror {
+  height: 500px!important;
+}
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index aca7bc257..07967ba96 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -519,7 +519,7 @@
         '  id="<%=hId%>" aria-controls="<%=cId%>">',
         '<%=label%></a></li>'].join(" ")),
       'panel': _.template(
-        '<div role="tabpanel" class="tab-pane col-sm-12 col-md-12 col-lg-12 col-xs-12 fade" id="<%=cId%>" aria-labelledby="<%=hId%>"></div>'
+        '<div role="tabpanel" class="tab-pane <%=label%> col-sm-12 col-md-12 col-lg-12 col-xs-12 fade" id="<%=cId%>" aria-labelledby="<%=hId%>"></div>'
       )},
     render: function() {
       this.cleanup();
@@ -1307,7 +1307,7 @@
   var SqlTabControl = Backform.SqlTabControl = Backform.Control.extend({
     defaults: {
       label: "",
-      controlsClassName: "pgadmin-controls col-sm-12",
+      controlsClassName: "pgadmin-controls col-sm-12 SQL",
       extraClasses: [],
       helpMessage: null
     },