Skip to content

Commit 9de0074

Browse files
committed
- ignore margins on content (was causing content DIVs to be incorrectly placed)
- fix TabHost width/height around the wrong way - oops
1 parent e1de93c commit 9de0074

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

js/lib/tab/TabHost.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dockspawn.TabHost.prototype.setActiveTab = function(container)
7070
dockspawn.TabHost.prototype.resize = function(width, height)
7171
{
7272
this.hostElement.style.width = width + "px";
73-
this.hostElement.style.height = width + "px";
73+
this.hostElement.style.height = height + "px";
7474

7575
var tabHeight = this.tabListElement.clientHeight;
7676
var separatorHeight = this.separatorElement.clientHeight;

js/out/css/dock-manager.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
width: 100%;
4040
}
4141

42+
.panel-content * {
43+
margin: 0px;
44+
}
45+
4246
/***************** Floating dialog box ****************/
4347
.dialog-floating {
4448
position: absolute;
@@ -170,6 +174,10 @@
170174
background-color: #666;
171175
}
172176

177+
.tab-content * {
178+
margin: 0px;
179+
}
180+
173181
.tab-handle {
174182
position: relative;
175183
background-color: #05B;

js/out/js/dockspawn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ dockspawn.TabHost.prototype.setActiveTab = function(container)
180180
dockspawn.TabHost.prototype.resize = function(width, height)
181181
{
182182
this.hostElement.style.width = width + "px";
183-
this.hostElement.style.height = width + "px";
183+
this.hostElement.style.height = height + "px";
184184

185185
var tabHeight = this.tabListElement.clientHeight;
186186
var separatorHeight = this.separatorElement.clientHeight;

0 commit comments

Comments
 (0)