Hi,
Please find the attached updated patch.
Thanks,
Khushboo
On Mon, Dec 12, 2016 at 3:30 PM, Dave Page <dp...@pgadmin.org> wrote:
> Hi
>
> On Fri, Dec 9, 2016 at 11:37 AM, Khushboo Vashi
> <khushboo.va...@enterprisedb.com> wrote:
> > Hi,
> >
> > Please find the attached patch to fix the RM 1780: Rendering glitches in
> the
> > query editor line number column when editing many lines.
> >
> > Some codemirror css were overwritten to increase the width of the line
> > number column in sql editor.
> > Due to those changes this issue was coming, I have removed those css
> changes
> > and set the line number column to the default size.
> >
> > Please review the patch and let me know if any other UI changes are
> > required.
>
> This seems to work nicely in the query tool, as well as the properties
> pane and for the source code on the properties dialogues for
> functions/views etc.
>
> However, it doesn't seem to work well on the SQL tab of dialogues (see
> the attached screenshot). If you can fix that without changing the
> now-improved behaviour elsewhere, I think this will be a good
> improvement.
>
Fixed
> Thanks.
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css
index ad84aa7..0567567 100755
--- a/web/pgadmin/static/css/overrides.css
+++ b/web/pgadmin/static/css/overrides.css
@@ -52,8 +52,9 @@ iframe {
}
/* Ensure the codemirror editor displays full height gutters when resized */
-.CodeMirror, .CodeMirror-gutters {
+.CodeMirror, .CodeMirror-gutter {
height: 100% !important;
+ min-height: 100% !important;
}
/* Padding for the treeview */
@@ -268,6 +269,7 @@ iframe {
.pgadmin-controls.SQL {
padding-right: 3px;
padding-left: 1px;
+ height: 100%;
}
.pgadmin-controls > textarea.form-control,
.pgadmin-controls > textarea.form-control[disabled] {
@@ -916,11 +918,13 @@ td.edit-cell.editable.sortable.renderable.editor {
.tab-pane.SQL {
padding: 0px 7px 0px 0px;
+ height: 100%;
}
.pgadmin-control-group.sql {
margin: 0px;
padding: 0px;
+ height: 100%;
}
.nav-tabs{
@@ -996,10 +1000,6 @@ ul.nav.nav-tabs {
background-position: 0px 2px;
}
-.pgadmin-controls.SQL>.CodeMirror {
- height: 500px !important;
-}
-
/* This rule will stop Chrome apply highlighting to elements such as DIV's used as modals */
*:focus {
outline: none;
diff --git a/web/pgadmin/static/css/pgadmin.css b/web/pgadmin/static/css/pgadmin.css
index e41d0bb..9729d51 100644
--- a/web/pgadmin/static/css/pgadmin.css
+++ b/web/pgadmin/static/css/pgadmin.css
@@ -718,6 +718,7 @@ lgg-el-container[el=md] .pg-el-lg-8,
.pg-el-container ul.tab-content {
min-height: calc(100% - 10px);
+ height: 100%;
}
.pgadmin-control-group {
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index 8d2d280..db79a73 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -1456,13 +1456,6 @@
this.sqlCtrl.setValue('-- ' + window.pgAdmin.Browser.messages.SQL_NO_CHANGE);
}
this.sqlCtrl.refresh.apply(this.sqlCtrl);
-
- this.$el.find('.CodeMirror').css(
- 'cssText',
- 'height: ' + (
- this.$el.closest('.tab-content').height() + 8
- ) + 'px !important;'
- );
}
},
onPanelResized: function(o) {
diff --git a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
index f22963b..35c18ef 100644
--- a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
+++ b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
@@ -157,24 +157,13 @@
.CodeMirror, #editor-panel .CodeMirror-gutters {
min-height: 100%;
+ height: 100%;
}
-/* Changes specific to output panel of query tool */
-#output-panel, #output-panel .CodeMirror, #output-panel .CodeMirror-gutters {
+#output-panel {
height: 100% !important;
}
-#output-panel .CodeMirror-gutter-wrapper {
- width: 43px;
- height: 22px;
- border-right: 1px solid #ddd !important;
- background: #f7f7f7 !important;
-}
-
-.CodeMirror-foldgutter {
- width: .9em;
-}
-
.CodeMirror-foldgutter-open,
.CodeMirror-foldgutter-folded {
cursor: pointer;
@@ -431,8 +420,8 @@ input.editor-checkbox {
Ref: https://github.com/mleibman/SlickGrid/issues/742
*/
.slickgrid, .slickgrid *, .slick-header-column {
- box-sizing: content-box;
- -moz-box-sizing: content-box;
- -webkit-box-sizing: content-box;
- -ms-box-sizing: content-box;
-}
\ No newline at end of file
+ box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+ -ms-box-sizing: content-box;
+}
--
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
