Skip to content

Commit 13893bc

Browse files
committed
Minor style updates to DBView
1 parent b435e74 commit 13893bc

1 file changed

Lines changed: 24 additions & 19 deletions

File tree

ui/javascript/widgets/DBView.js

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ javaxt.express.DBView = function(parent, config) {
9393
color: "#bfc0c3"
9494
},
9595

96+
rightPanel: {
97+
98+
},
99+
96100
bottomPanel: {
97101
backgroundColor: "#e4e4e4",
98102
borderTop: "1px solid #b5b5b5"
@@ -105,22 +109,13 @@ javaxt.express.DBView = function(parent, config) {
105109
toolbar: "panel-toolbar",
106110
toolbarButton: {}, //javaxt.dhtml.style.default.toolbarButton
107111
toolbarIcons: {
108-
run: "runIcon",
109-
cancel: "deleteIcon"
112+
run: "run-icon",
113+
cancel: "stop-icon"
110114
},
111115

112116
editor: {
113117
height: "240px",
114-
/*
115-
background: "inherit",
116-
border: "0px none",
117-
118-
margin: 0,
119-
padding: "5px 10px",
120-
121-
fontFamily: '"Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace',
122-
color: "#97989c"
123-
*/
118+
fontFamily: '"Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace'
124119
},
125120

126121
table: {}, //javaxt.dhtml.style.default.table
@@ -188,6 +183,7 @@ javaxt.express.DBView = function(parent, config) {
188183

189184
//Create main div
190185
var div = createElement('div', parent, config.style.container);
186+
div.classList.add('javaxt-db-view');
191187
me.el = div;
192188
addShowHide(me);
193189

@@ -204,10 +200,10 @@ javaxt.express.DBView = function(parent, config) {
204200

205201

206202
//Right column
207-
var td = tr.addColumn({
208-
height: "100%",
209-
width: "100%"
210-
});
203+
var td = tr.addColumn(config.style.rightPanel);
204+
td.style.width = "100%";
205+
td.style.height = "100%";
206+
211207

212208
var hr = addHorizontalResizer(td, target);
213209
createQueryView(hr);
@@ -404,15 +400,22 @@ javaxt.express.DBView = function(parent, config) {
404400
//** createQueryView
405401
//**************************************************************************
406402
var createQueryView = function(parent){
407-
var table = createTable(parent);
403+
404+
//Create panel
405+
var panel = new javaxt.dhtml.Panel(parent, {
406+
style: {
407+
toolbar: config.style.toolbar
408+
}
409+
});
408410

409411

410412
//Create toolbar
411-
toolbar = table.addRow().addColumn(config.style.toolbar);
413+
toolbar = panel.getToolbar();
412414
addButtons(toolbar);
413415

414416

415417
//Create editor
418+
var table = createTable(panel.getBody());
416419
var td = table.addRow().addColumn(config.style.editor);
417420
td.style.borderBottom = border;
418421

@@ -462,7 +465,9 @@ javaxt.express.DBView = function(parent, config) {
462465
resize: "none",
463466
border: "0 none",
464467
padding: "10px",
465-
boxSizing: "border-box" //this is critical if you want padding
468+
boxSizing: "border-box", //this is critical if you want padding
469+
fontFamily: "inherit",
470+
fontSize: "inherit"
466471
});
467472
editor.spellcheck = false;
468473
editor.getValue = function(){

0 commit comments

Comments
 (0)