X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fbootstrap%2FInput.js;fp=Roo%2Fbootstrap%2FInput.js;h=21f9ea1a7f550210f41f6ba21f292760216b6ffd;hb=294506d9a9f5302102745775107795bdc854e4e7;hp=6b970c186044a73145d6fd9de23f12d43f60c7c4;hpb=055eecf17935accbac343697b384ed6d32d800f0;p=roojs1 diff --git a/Roo/bootstrap/Input.js b/Roo/bootstrap/Input.js index 6b970c1860..21f9ea1a7f 100644 --- a/Roo/bootstrap/Input.js +++ b/Roo/bootstrap/Input.js @@ -537,9 +537,10 @@ Roo.extend(Roo.bootstrap.Input, Roo.bootstrap.Component, { cfg.cls += ' navbar-form'; } - if (this.parentType === 'NavGroup') { - cfg.cls += ' navbar-form'; - cfg.tag = 'li'; + if (this.parentType === 'NavGroup' && !(Roo.bootstrap.version == 4 && this.parent().form)) { + // on BS4 we do this only if not form + cfg.cls += ' navbar-form'; + cfg.tag = 'li'; } return cfg;