}
if (!settings[size]) { // 0 = hidden
- cfg.cls += ' hidden-' + size;
+ cfg.cls += ' hidden-' + size + ' hidden' + size + '-down';;
return;
}
- cfg.cls += ' col-' + size + '-' + settings[size];
+ cfg.cls += ' col-' + size + '-' + settings[size] + (
+ size == 'xs' ? (' col-' + settings[size] ) : '' // bs4 col-{num} replaces col-xs
+ );
});
// i'm not actually sure these are really used - normally we add a navGroup to a navbar
- if (Roo.bootstrap.version == 4 && this.xtype == 'NavSimpleBar') {
+ if (Roo.bootstrap.version == 4 && this.xtype == 'NavSimplebar') {
return cfg;
}
cfg.cn = [
{
- cls: 'nav nav-simplebar',
+ cls: 'nav nav-' + this.xtype,
tag : 'ul'
}
];
if (!config[size]) { // 0 = hidden
// BS 4 '0' is treated as hide that column and below.
- c.cls += ' hidden-' + size + ' hidden' + size + 'down';
+ c.cls += ' hidden-' + size + ' hidden' + size + '-down';
return;
}
if (!config[size]) { // 0 = hidden
// BS 4 '0' is treated as hide that column and below.
- td.cls += ' hidden-' + size + ' hidden' + size + 'down';
+ td.cls += ' hidden-' + size + ' hidden' + size + '-down';
return;
}
combobox.cn.push({
tag :'span',
- cls : 'input-group-addon input-group-append input-group-text btn dropdown-toggle',
+ cls : 'input-group-addon input-group-append input-group-text btn' +
+ (Roo.bootstrap.version == 3 ? ' dropdown-toggle' : ''),
cn : [
caret,
{
Roo.bootstrap.TriggerField.superclass.initEvents.call(this);
//this.wrap = this.el.wrap({cls: "x-form-field-wrap"});
if(!this.multiple && this.showToggleBtn){
- this.trigger = this.el.select('span.dropdown-toggle',true).first();
+ this.trigger = this.el.select('span.input-group-append',true).first();
if(this.hideTrigger){
this.trigger.setDisplayed(false);
}
combobox.cn.push({
tag :'span',
- cls : 'input-group-addon input-group-append input-group-text btn dropdown-toggle',
+ cls : 'input-group-addon input-group-append input-group-text btn' +
+ (Roo.bootstrap.version == 3 ? ' dropdown-toggle' : ''),
cn : [
caret,
{
this.originalValue = this.getValue();
- this.triggerEl = this.el.select('span.dropdown-toggle',true).first();
+ this.triggerEl = this.el.select('span.input-group-append',true).first();
this.inputEl().on("click", this.showTouchView, this);
if (this.triggerEl) {