X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=Roo%2Fbootstrap%2FComponent.js;fp=Roo%2Fbootstrap%2FComponent.js;h=d2632d5a749a2649a793b3d27c766ee3884a2ed6;hp=efd739fe6171af299a6186e9defea75ce4058f43;hb=5ba88dd4a3a3098a79287438e6aebe26b076010d;hpb=d75026bef72394ce3d2c021d94f5b33a9cfca10b

diff --git a/Roo/bootstrap/Component.js b/Roo/bootstrap/Component.js
index efd739fe61..d2632d5a74 100644
--- a/Roo/bootstrap/Component.js
+++ b/Roo/bootstrap/Component.js
@@ -117,11 +117,11 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent,  {
         }
         
         if (this.cls) {
-            cfg.cls = (typeof(cfg.cls) == 'undefined') ? this.cls : cfg.cls + ' ' + this.cls;
+            cfg.cls = (typeof(cfg.cls) == 'undefined' ? this.cls : cfg.cls) + ' ' + this.cls;
         }
         
         if (this.style) { // fixme needs to support more complex style data.
-            cfg.style = this.style;
+            cfg.style = (typeof(cfg.style) == 'undefined' ? this.style : cfg.style) + '; ' + this.style;
         }
         
         if(this.name){