Roo/bootstrap/MessageBar.js

roojs-bootstrap.js
roojs-bootstrap-debug.js

diff --git a/Roo/bootstrap/MessageBar.js b/Roo/bootstrap/MessageBar.js
index ec12d0e..2c32acd 100644 (file)
--- a/Roo/bootstrap/MessageBar.js
+++ b/Roo/bootstrap/MessageBar.js
@@ -93,6 +93,12 @@ Roo.extend(Roo.bootstrap.MessageBar, Roo.bootstrap.Component,  {
         this.el.hide();
         
         Roo.select('.bootstrap-sticky-wrap', true).first().setStyle('margin-top', '0px');
+        
+        var navbar_fixed_top = Roo.select('.navbar-fixed-top', true).first();
+        
+        if(navbar_fixed_top != null){
+            navbar_fixed_top.setStyle('margin-top', '0px');
+        }
     }
    
 });

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 5088a57..39bad2d 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -15621,7 +15621,7 @@ Roo.extend(Roo.bootstrap.MessageBar, Roo.bootstrap.Component,  {
             this.render();
         }
         
-//        Roo.select('.bootstrap-sticky-wrap', true).first().setStyle('margin-top', this.el.getHeight() + 'px');
+        Roo.select('.bootstrap-sticky-wrap', true).first().setStyle('margin-top', this.el.getHeight() + 'px');
         
         var navbar_fixed_top = Roo.select('.navbar-fixed-top', true).first();
         
@@ -15636,6 +15636,12 @@ Roo.extend(Roo.bootstrap.MessageBar, Roo.bootstrap.Component,  {
         this.el.hide();
         
         Roo.select('.bootstrap-sticky-wrap', true).first().setStyle('margin-top', '0px');
+        
+        var navbar_fixed_top = Roo.select('.navbar-fixed-top', true).first();
+        
+        if(navbar_fixed_top != null){
+            navbar_fixed_top.setStyle('margin-top', '0px');
+        }
     }
    
 });

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 05cbf9c..a617cfd 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -336,4 +336,5 @@ this.fireEvent("rowdeselect",this,A);this.fireEvent("selectionchange",this);},re
 //Roo/bootstrap/MessageBar.js
 Roo.bootstrap.MessageBar=function(A){Roo.bootstrap.MessageBar.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.MessageBar,Roo.bootstrap.Component,{html:'',weight:'info',closable:true,getAutoCreate:function(){var A={tag:'div',cls:'alert alert-dismissable alert-messages alert-'+this.weight,html:this.html||''};if(this.closable){A.cn={tag:'button',cls:'close',html:'x'}}return A;},onRender:function(ct,A){Roo.bootstrap.Component.superclass.onRender.call(this,ct,A);if(!this.el){var B=Roo.apply({},this.getAutoCreate());B.id=Roo.id();if(this.cls){B.cls+=' '+this.cls;}if(this.style){B.style=this.style;}
 this.el=Roo.get(document.body).createChild(B,A);}
-this.el.select('>button.close').on('click',this.hide,this);},show:function(){if(!this.rendered){this.render();}var A=Roo.select('.navbar-fixed-top',true).first();if(A!=null){A.setStyle('margin-top',this.el.getHeight()+'px');}},hide:function(){this.el.hide();Roo.select('.bootstrap-sticky-wrap',true).first().setStyle('margin-top','0px');}});
+this.el.select('>button.close').on('click',this.hide,this);},show:function(){if(!this.rendered){this.render();}
+Roo.select('.bootstrap-sticky-wrap',true).first().setStyle('margin-top',this.el.getHeight()+'px');var A=Roo.select('.navbar-fixed-top',true).first();if(A!=null){A.setStyle('margin-top',this.el.getHeight()+'px');}},hide:function(){this.el.hide();Roo.select('.bootstrap-sticky-wrap',true).first().setStyle('margin-top','0px');var A=Roo.select('.navbar-fixed-top',true).first();if(A!=null){A.setStyle('margin-top','0px');}}});