From: Alan Knowles <alan@roojs.com>
Date: Mon, 4 Jan 2021 06:22:23 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=f7e76b4b856168df7e4de782f251e524ce8a5650

sync
---

diff --git a/Roo/bootstrap/Card.js b/Roo/bootstrap/Card.js
index 4542f5c85c..507fae2d63 100644
--- a/Roo/bootstrap/Card.js
+++ b/Roo/bootstrap/Card.js
@@ -219,7 +219,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
         if (this.header.length) {
             hdr = {
                 tag : this.header_size > 0 ? 'h' + this.header_size : 'div',
-                cls : 'card-header',
+                cls : 'card-header' + (this.header_weight ? 'bg-' + this.header_weight : ''),
                 cn : []
             };
             cfg.cn.push(hdr);
@@ -227,7 +227,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
         } else {
             hdr = {
                 tag : 'div',
-                cls : 'card-header d-none',
+                cls : 'card-header d-none' + (this.header_weight ? 'bg-' + this.header_weight : ''),
                 cn : []
             };
             cfg.cn.push(hdr);
diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 047939304f..6b3606b79a 100644
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -19497,6 +19497,22 @@
           "5"
         ]
       },
+      {
+        "name" : "header_weight",
+        "type" : "Number",
+        "desc" : "k)",
+        "memberOf" : "",
+        "optvals" : [
+          "primary",
+          "secondary",
+          "success",
+          "info",
+          "warning",
+          "danger",
+          "light",
+          "dark"
+        ]
+      },
       {
         "name" : "hideMode",
         "type" : "String",
diff --git a/docs/src/Roo_bootstrap_Card.js.html b/docs/src/Roo_bootstrap_Card.js.html
index 234276d239..8c8ecae0af 100644
--- a/docs/src/Roo_bootstrap_Card.js.html
+++ b/docs/src/Roo_bootstrap_Card.js.html
@@ -14,6 +14,7 @@
  * @cfg {String} header_image  src url of image.
  * @cfg {String|Object} header
  * @cfg {Number} header_size (0|1|2|3|4|5) H1 or H2 etc.. 0 indicates default
+ * @cfg {Number} header_weight  (primary|secondary|success|info|warning|danger|light|dark)
  * 
  * @cfg {String} title
  * @cfg {String} subtitle
diff --git a/docs/src/Roo_bootstrap_panel_Content.js.html b/docs/src/Roo_bootstrap_panel_Content.js.html
index 556eeb2584..1f1d379d97 100644
--- a/docs/src/Roo_bootstrap_panel_Content.js.html
+++ b/docs/src/Roo_bootstrap_panel_Content.js.html
@@ -59,7 +59,9 @@
         }</span><span class="jsdoc-keyword">else</span><span class="jsdoc-syntax">{
             </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">elcfg </span><span class="jsdoc-syntax">=  {
                 </span><span class="jsdoc-var">tag</span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">&quot;div&quot;</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">cls</span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">&quot;roo-layout-inactive-content&quot;</span><span class="jsdoc-syntax">,
+                </span><span class="jsdoc-var">cls</span><span class="jsdoc-syntax">: (</span><span class="jsdoc-var">config.cls </span><span class="jsdoc-syntax">|| </span><span class="jsdoc-string">''</span><span class="jsdoc-syntax">) +
+                    (</span><span class="jsdoc-var">config.background </span><span class="jsdoc-syntax">? </span><span class="jsdoc-string">' bg-' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">config.background </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">''</span><span class="jsdoc-syntax">) +
+                    </span><span class="jsdoc-string">&quot; roo-layout-inactive-content&quot;</span><span class="jsdoc-syntax">,
                 </span><span class="jsdoc-var">id</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">config.id</span><span class="jsdoc-syntax">||</span><span class="jsdoc-var">el
             </span><span class="jsdoc-syntax">};
             </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">config.html</span><span class="jsdoc-syntax">) {
diff --git a/docs/symbols/Roo.bootstrap.Card.json b/docs/symbols/Roo.bootstrap.Card.json
index 67420ea935..5081de51cb 100644
--- a/docs/symbols/Roo.bootstrap.Card.json
+++ b/docs/symbols/Roo.bootstrap.Card.json
@@ -209,6 +209,22 @@
       "memberOf" : "Roo.Component",
       "optvals" : []
     },
+    {
+      "name" : "header_weight",
+      "type" : "Number",
+      "desc" : "k)",
+      "memberOf" : "Roo.bootstrap.Card",
+      "optvals" : [
+        "primary",
+        "secondary",
+        "success",
+        "info",
+        "warning",
+        "danger",
+        "light",
+        "dark"
+      ]
+    },
     {
       "name" : "style",
       "type" : "String",