From f641320f1586bbb472f5d3fd759b63391d41b69b Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 19 Oct 2020 11:34:06 +0800 Subject: [PATCH] sync --- css-bootstrap4/bootstrap.css.map | 2 +- css-bootstrap4/roojs-bootstrap-debug.css.map | 2 +- docs/src/Roo_bootstrap_Card.js.html | 2 +- docs/src/Roo_bootstrap_CheckBox.js.html | 4 ++-- docs/src/Roo_bootstrap_Column.js.html | 11 +++++++++-- docs/src/Roo_bootstrap_NavHeaderbar.js.html | 9 ++++++++- docs/summary.txt | 1 + 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/css-bootstrap4/bootstrap.css.map b/css-bootstrap4/bootstrap.css.map index e55fae6871..6bfbf2627b 100644 --- a/css-bootstrap4/bootstrap.css.map +++ b/css-bootstrap4/bootstrap.css.map @@ -2,7 +2,7 @@ "version": 3, "file": "bootstrap.css", "sources": [ - "../../../../../tmp/scssQnY6R3", + "../../../../../tmp/scssjsFU3A", "../scss/bootstrap/_functions.scss", "../scss/bootstrap/_variables.scss", "../scss/bootstrap/bootstrap.scss", diff --git a/css-bootstrap4/roojs-bootstrap-debug.css.map b/css-bootstrap4/roojs-bootstrap-debug.css.map index a7e22a9e15..35c03df18c 100644 --- a/css-bootstrap4/roojs-bootstrap-debug.css.map +++ b/css-bootstrap4/roojs-bootstrap-debug.css.map @@ -2,7 +2,7 @@ "version": 3, "file": "roojs-bootstrap-debug.css", "sources": [ - "../../../../../tmp/scssyEKff1", + "../../../../../tmp/scssDXHPQy", "../scss/bootstrap/_functions.scss", "../scss/bootstrap/_variables.scss", "../scss/roojs-bootstrap/roojs-bootstrap.scss", diff --git a/docs/src/Roo_bootstrap_Card.js.html b/docs/src/Roo_bootstrap_Card.js.html index 9d0bb94c1d..efba7d8f05 100644 --- a/docs/src/Roo_bootstrap_Card.js.html +++ b/docs/src/Roo_bootstrap_Card.js.html @@ -280,7 +280,7 @@ return dragData; } return false; - }, + } }); diff --git a/docs/src/Roo_bootstrap_CheckBox.js.html b/docs/src/Roo_bootstrap_CheckBox.js.html index 1864c9011d..259b449533 100644 --- a/docs/src/Roo_bootstrap_CheckBox.js.html +++ b/docs/src/Roo_bootstrap_CheckBox.js.html @@ -69,10 +69,10 @@ var cfg = {}; - cfg.cls = 'form-group ' + this.inputType; //input-group + cfg.cls = 'form-group form-check ' + this.inputType; //input-group if(this.inline){ - cfg.cls += ' ' + this.inputType + '-inline'; + cfg.cls += ' ' + this.inputType + '-inline form-check-inline'; } var input = { diff --git a/docs/src/Roo_bootstrap_Column.js.html b/docs/src/Roo_bootstrap_Column.js.html index 530bbb7da5..05b9f4cf9d 100644 --- a/docs/src/Roo_bootstrap_Column.js.html +++ b/docs/src/Roo_bootstrap_Column.js.html @@ -64,7 +64,8 @@ }; var settings=this; - ['xs','sm','md','lg'].map(function(size){ + var sizes = ['xs','sm','md','lg']; + sizes.map(function(size ,ix){ //Roo.log( size + ':' + settings[size]); if (settings[size+'off'] !== false) { @@ -76,7 +77,13 @@ } if (!settings[size]) { // 0 = hidden - cfg.cls += ' hidden-' + size + ' hidden' + size + '-down';; + cfg.cls += ' hidden-' + size + ' hidden-' + size + '-down'; + // bootsrap4 + for (var i = ix; i > -1; i--) { + cfg.cls += ' d-' + sizes[i] + '-none'; + } + + return; } cfg.cls += ' col-' + size + '-' + settings[size] + ( diff --git a/docs/src/Roo_bootstrap_NavHeaderbar.js.html b/docs/src/Roo_bootstrap_NavHeaderbar.js.html index 91f48db619..ba5fa541c2 100644 --- a/docs/src/Roo_bootstrap_NavHeaderbar.js.html +++ b/docs/src/Roo_bootstrap_NavHeaderbar.js.html @@ -93,7 +93,7 @@ cn.push({ tag: 'div', - cls: Roo.bootstrap.version == 4 ? 'nav flex-row roo-navbar-collapse' : 'collapse navbar-collapse roo-navbar-collapse', + cls: Roo.bootstrap.version == 4 ? 'nav flex-row roo-navbar-collapse collapse navbar-collapse' : 'collapse navbar-collapse roo-navbar-collapse', cn : [] }); @@ -143,6 +143,13 @@ return this.getChildContainer(); }, + getChildContainer : function() + { + + return this.el.select('.roo-navbar-collapse',true).first(); + + + }, initEvents : function() { diff --git a/docs/summary.txt b/docs/summary.txt index 93d7477aa5..81dfa7388f 100644 --- a/docs/summary.txt +++ b/docs/summary.txt @@ -112,6 +112,7 @@ Bootstrap Widgets Layout Roo.bootstrap.Column Roo.bootstrap.Row + Roo.bootstrap.Card Bootstrap 4 Card Roo.bootstrap.Container Panel Jumbo Roo.bootstrap.Slider Header slider panel Roo.bootstrap.Alert alert area -- 2.39.2