From ccabd599f201c0cfdbcbbcb68f0c3bf71de3991c Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 25 Nov 2020 18:20:41 +0800 Subject: [PATCH] sync --- css-bootstrap4/bootstrap.css.map | 2 +- css-bootstrap4/bootstrap.min.css.map | 2 +- css-bootstrap4/roojs-bootstrap-debug.css.map | 2 +- css-bootstrap4/roojs-bootstrap.css.map | 2 +- docs/json/roodata.json | 5 +++-- docs/src/Roo_bootstrap_Modal.js.html | 2 +- docs/summary.txt | 1 + docs/symbols/Roo.bootstrap.Modal.json | 5 +++-- roojs-bootstrap-debug.js | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/css-bootstrap4/bootstrap.css.map b/css-bootstrap4/bootstrap.css.map index 901dac9050..381f39d14a 100644 --- a/css-bootstrap4/bootstrap.css.map +++ b/css-bootstrap4/bootstrap.css.map @@ -2,7 +2,7 @@ "version": 3, "file": "bootstrap.css", "sources": [ - "../../../../../tmp/scssiDRhV4", + "../../../../../tmp/scss64Ul6s", "../scss/bootstrap/_functions.scss", "../scss/bootstrap/_variables.scss", "../scss/bootstrap/bootstrap.scss", diff --git a/css-bootstrap4/bootstrap.min.css.map b/css-bootstrap4/bootstrap.min.css.map index 526774ad5a..aa5ab62f16 100644 --- a/css-bootstrap4/bootstrap.min.css.map +++ b/css-bootstrap4/bootstrap.min.css.map @@ -2,7 +2,7 @@ "version": 3, "file": "bootstrap.min.css", "sources": [ - "../../../../../tmp/scssiDRhV4", + "../../../../../tmp/scss64Ul6s", "../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 ffc97976a7..b4b334ad00 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/scssL94YU0", + "../../../../../tmp/scssdyuD3s", "../scss/bootstrap/_functions.scss", "../scss/bootstrap/_variables.scss", "../scss/roojs-bootstrap/roojs-bootstrap.scss", diff --git a/css-bootstrap4/roojs-bootstrap.css.map b/css-bootstrap4/roojs-bootstrap.css.map index d74735bbda..750bd370c0 100644 --- a/css-bootstrap4/roojs-bootstrap.css.map +++ b/css-bootstrap4/roojs-bootstrap.css.map @@ -2,7 +2,7 @@ "version": 3, "file": "roojs-bootstrap.css", "sources": [ - "../../../../../tmp/scssL94YU0", + "../../../../../tmp/scssdyuD3s", "../scss/bootstrap/_functions.scss", "../scss/bootstrap/_variables.scss", "../scss/roojs-bootstrap/roojs-bootstrap.scss", diff --git a/docs/json/roodata.json b/docs/json/roodata.json index 021fc24979..0bce7e0098 100644 --- a/docs/json/roodata.json +++ b/docs/json/roodata.json @@ -38335,11 +38335,12 @@ { "name" : "size", "type" : "String", - "desc" : "g) default empty", + "desc" : "l) default empty", "memberOf" : "", "optvals" : [ "sm", - "lg" + "lg", + "xl" ] }, { diff --git a/docs/src/Roo_bootstrap_Modal.js.html b/docs/src/Roo_bootstrap_Modal.js.html index 7bacd7ed99..edbaed14fe 100644 --- a/docs/src/Roo_bootstrap_Modal.js.html +++ b/docs/src/Roo_bootstrap_Modal.js.html @@ -18,7 +18,7 @@ * @cfg {Boolean} fitwindow default false * @cfg {Number} width fixed width - usefull for chrome extension only really. * @cfg {Number} height fixed height - usefull for chrome extension only really. - * @cfg {String} size (sm|lg) default empty + * @cfg {String} size (sm|lg|xl) default empty * @cfg {Number} max_width set the max width of modal * @cfg {Boolean} editableTitle can the title be edited diff --git a/docs/summary.txt b/docs/summary.txt index c5e3194361..454b6de73b 100644 --- a/docs/summary.txt +++ b/docs/summary.txt @@ -145,6 +145,7 @@ Bootstrap Widgets Cards Roo.bootstrap.Card a interactive card element (dragable / expandabe etc.) + [examples/bootstrap4/dashboard4.html] Dragable Trello like cards. Roo.bootstrap.CardHeader container for header elements Roo.bootstrap.CardFooter container for footer elements Roo.bootstrap.CardImageTop container for footer elements diff --git a/docs/symbols/Roo.bootstrap.Modal.json b/docs/symbols/Roo.bootstrap.Modal.json index 386b90889e..9cfac2747b 100644 --- a/docs/symbols/Roo.bootstrap.Modal.json +++ b/docs/symbols/Roo.bootstrap.Modal.json @@ -205,11 +205,12 @@ { "name" : "size", "type" : "String", - "desc" : "g) default empty", + "desc" : "l) default empty", "memberOf" : "Roo.bootstrap.Modal", "optvals" : [ "sm", - "lg" + "lg", + "xl" ] }, { diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 43aa293fb7..5231918360 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -3845,7 +3845,7 @@ Roo.extend(Roo.bootstrap.MenuSeparator, Roo.bootstrap.Component, { * @cfg {Boolean} fitwindow default false * @cfg {Number} width fixed width - usefull for chrome extension only really. * @cfg {Number} height fixed height - usefull for chrome extension only really. - * @cfg {String} size (sm|lg) default empty + * @cfg {String} size (sm|lg|xl) default empty * @cfg {Number} max_width set the max width of modal * @cfg {Boolean} editableTitle can the title be edited -- 2.39.2