From 682ba21ea0d7ae96d14d677325ed44307824bd5d Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 11 Sep 2014 17:14:24 +0800 Subject: [PATCH] examples/bootstrap/dashboard1.bjs.U7KCMX examples/bootstrap/dashboard1.bjs examples/bootstrap/dashboard1.js.ULFCMX examples/bootstrap/dashboard1.js --- examples/bootstrap/dashboard1.bjs | 9 +++++---- examples/bootstrap/dashboard1.js | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/bootstrap/dashboard1.bjs b/examples/bootstrap/dashboard1.bjs index 918221ea73..0e8a987c6d 100644 --- a/examples/bootstrap/dashboard1.bjs +++ b/examples/bootstrap/dashboard1.bjs @@ -13,8 +13,8 @@ "items" : [ { "String cls" : "header", - "xtype" : "Container", "tag" : "header", + "xtype" : "Container", "* xinclude" : "Dashboard.Header1", "$ xns" : "Roo.bootstrap" }, @@ -301,8 +301,8 @@ }, { "xtype" : "Header", - "$ xns" : "Roo.bootstrap", "Number level" : 4, + "$ xns" : "Roo.bootstrap", "String html" : "With Icons" }, { @@ -329,8 +329,8 @@ }, { "xtype" : "Header", - "Number level" : 4, "$ xns" : "Roo.bootstrap", + "Number level" : 4, "String html" : "With checkbox and radio" }, { @@ -356,8 +356,8 @@ }, { "xtype" : "Header", - "$ xns" : "Roo.bootstrap", "Number level" : 4, + "$ xns" : "Roo.bootstrap", "String html" : "With buttons" }, { @@ -367,6 +367,7 @@ "string size" : "md", "items" : [ { + "String weight" : "primary", "xtype" : "Button", "$ xns" : "Roo.bootstrap", "String html" : "test", diff --git a/examples/bootstrap/dashboard1.js b/examples/bootstrap/dashboard1.js index 8aa99ff8e1..51b7616e4a 100644 --- a/examples/bootstrap/dashboard1.js +++ b/examples/bootstrap/dashboard1.js @@ -21,8 +21,8 @@ dashboard1 = new Roo.XComponent({ items : [ Roo.apply(Dashboard.Header1._tree(), { cls : 'header', - xtype : 'Container', tag : 'header', + xtype : 'Container', xns : Roo.bootstrap }), { @@ -322,8 +322,8 @@ dashboard1 = new Roo.XComponent({ }, { xtype : 'Header', - xns : Roo.bootstrap, level : 4, + xns : Roo.bootstrap, html : 'With Icons' }, { @@ -350,8 +350,8 @@ dashboard1 = new Roo.XComponent({ }, { xtype : 'Header', - level : 4, xns : Roo.bootstrap, + level : 4, html : 'With checkbox and radio' }, { @@ -378,12 +378,13 @@ dashboard1 = new Roo.XComponent({ }, { xtype : 'Header', - xns : Roo.bootstrap, level : 4, + xns : Roo.bootstrap, html : 'With buttons' }, { before : { + weight : 'primary', xtype : 'Button', xns : Roo.bootstrap, html : 'test' -- 2.39.2