sync

diff --git a/css-bootstrap4/bootstrap.css.map b/css-bootstrap4/bootstrap.css.map
index e55fae6..6bfbf26 100644 (file)
--- 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 a7e22a9..35c03df 100644 (file)
--- 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 9d0bb94..efba7d8 100644 (file)
--- a/docs/src/Roo_bootstrap_Card.js.html
+++ b/docs/src/Roo_bootstrap_Card.js.html
@@ -280,7 +280,7 @@
             </span><span class="jsdoc-keyword">return </span><span class="jsdoc-var">dragData</span><span class="jsdoc-syntax">;
         }
         </span><span class="jsdoc-keyword">return false</span><span class="jsdoc-syntax">;
-    },
+    }
 
 });
 

diff --git a/docs/src/Roo_bootstrap_CheckBox.js.html b/docs/src/Roo_bootstrap_CheckBox.js.html
index 1864c90..259b449 100644 (file)
--- a/docs/src/Roo_bootstrap_CheckBox.js.html
+++ b/docs/src/Roo_bootstrap_CheckBox.js.html
@@ -69,10 +69,10 @@
 
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">cfg </span><span class="jsdoc-syntax">= {};
 
-        </span><span class="jsdoc-var">cfg.cls </span><span class="jsdoc-syntax">= </span><span class="jsdoc-string">'form-group ' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">this.inputType</span><span class="jsdoc-syntax">; </span><span class="jsdoc-comment">//input-group
+        </span><span class="jsdoc-var">cfg.cls </span><span class="jsdoc-syntax">= </span><span class="jsdoc-string">'form-group form-check ' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">this.inputType</span><span class="jsdoc-syntax">; </span><span class="jsdoc-comment">//input-group
 
         </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.inline</span><span class="jsdoc-syntax">){
-            </span><span class="jsdoc-var">cfg.cls </span><span class="jsdoc-syntax">+= </span><span class="jsdoc-string">' ' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">this.inputType </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-string">'-inline'</span><span class="jsdoc-syntax">;
+            </span><span class="jsdoc-var">cfg.cls </span><span class="jsdoc-syntax">+= </span><span class="jsdoc-string">' ' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">this.inputType </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-string">'-inline  form-check-inline'</span><span class="jsdoc-syntax">;
         }
 
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">input </span><span class="jsdoc-syntax">=  {

diff --git a/docs/src/Roo_bootstrap_Column.js.html b/docs/src/Roo_bootstrap_Column.js.html
index 530bbb7..05b9f4c 100644 (file)
--- a/docs/src/Roo_bootstrap_Column.js.html
+++ b/docs/src/Roo_bootstrap_Column.js.html
@@ -64,7 +64,8 @@
         </span><span class="jsdoc-syntax">};
 
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">settings</span><span class="jsdoc-syntax">=</span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">;
-        [</span><span class="jsdoc-string">'xs'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">'sm'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">'md'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">'lg'</span><span class="jsdoc-syntax">]</span><span class="jsdoc-var">.map</span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">){
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">sizes </span><span class="jsdoc-syntax">=   [</span><span class="jsdoc-string">'xs'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">'sm'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">'md'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">'lg'</span><span class="jsdoc-syntax">];
+        </span><span class="jsdoc-var">sizes.map</span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">,</span><span class="jsdoc-var">ix</span><span class="jsdoc-syntax">){
             </span><span class="jsdoc-comment">//Roo.log( size + ':' + settings[size]);
 
             </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">settings</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">+</span><span class="jsdoc-string">'off'</span><span class="jsdoc-syntax">] !== </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">) {
@@ -76,7 +77,13 @@
             }
 
             </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(!</span><span class="jsdoc-var">settings</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">]) { </span><span class="jsdoc-comment">// 0 = hidden
-                </span><span class="jsdoc-var">cfg.cls </span><span class="jsdoc-syntax">+= </span><span class="jsdoc-string">' hidden-' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-string">' hidden' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-string">'-down'</span><span class="jsdoc-syntax">;;
+                </span><span class="jsdoc-var">cfg.cls </span><span class="jsdoc-syntax">+= </span><span class="jsdoc-string">' hidden-' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-string">' hidden-' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-string">'-down'</span><span class="jsdoc-syntax">;
+                </span><span class="jsdoc-comment">// bootsrap4
+                </span><span class="jsdoc-keyword">for </span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">i </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">ix</span><span class="jsdoc-syntax">; </span><span class="jsdoc-var">i </span><span class="jsdoc-syntax">&gt; -1; </span><span class="jsdoc-var">i</span><span class="jsdoc-syntax">--) {
+                    </span><span class="jsdoc-var">cfg.cls </span><span class="jsdoc-syntax">+=  </span><span class="jsdoc-string">' d-' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">sizes</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">i</span><span class="jsdoc-syntax">] + </span><span class="jsdoc-string">'-none'</span><span class="jsdoc-syntax">;
+                }
+
+
                 </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">;
             }
             </span><span class="jsdoc-var">cfg.cls </span><span class="jsdoc-syntax">+= </span><span class="jsdoc-string">' col-' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-string">'-' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">settings</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">size</span><span class="jsdoc-syntax">] + (

diff --git a/docs/src/Roo_bootstrap_NavHeaderbar.js.html b/docs/src/Roo_bootstrap_NavHeaderbar.js.html
index 91f48db..ba5fa54 100644 (file)
--- a/docs/src/Roo_bootstrap_NavHeaderbar.js.html
+++ b/docs/src/Roo_bootstrap_NavHeaderbar.js.html
@@ -93,7 +93,7 @@
 
         </span><span class="jsdoc-var">cn.push</span><span class="jsdoc-syntax">({
             </span><span class="jsdoc-var">tag</span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'div'</span><span class="jsdoc-syntax">,
-            </span><span class="jsdoc-var">cls</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">Roo.bootstrap.version </span><span class="jsdoc-syntax">== 4  ? </span><span class="jsdoc-string">'nav flex-row roo-navbar-collapse' </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'collapse navbar-collapse roo-navbar-collapse'</span><span class="jsdoc-syntax">,
+            </span><span class="jsdoc-var">cls</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">Roo.bootstrap.version </span><span class="jsdoc-syntax">== 4  ? </span><span class="jsdoc-string">'nav flex-row roo-navbar-collapse collapse navbar-collapse' </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'collapse navbar-collapse roo-navbar-collapse'</span><span class="jsdoc-syntax">,
             </span><span class="jsdoc-var">cn </span><span class="jsdoc-syntax">: []
         });
 
@@ -143,6 +143,13 @@
         </span><span class="jsdoc-keyword">return </span><span class="jsdoc-var">this.getChildContainer</span><span class="jsdoc-syntax">();
     },
 
+    </span><span class="jsdoc-var">getChildContainer </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">()
+    {
+
+       </span><span class="jsdoc-keyword">return </span><span class="jsdoc-var">this.el.select</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'.roo-navbar-collapse'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">)</span><span class="jsdoc-var">.first</span><span class="jsdoc-syntax">();
+
+
+    },
 
     </span><span class="jsdoc-var">initEvents </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">()
     {

diff --git a/docs/summary.txt b/docs/summary.txt
index 93d7477..81dfa73 100644 (file)
--- 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