fix conflicts

[roojs1] / docs / symbols / Roo.Component.json

diff --git a/docs/symbols/Roo.Component.json b/docs/symbols/Roo.Component.json
index 3aab25a..cfb18aa 100644 (file)
--- a/docs/symbols/Roo.Component.json
+++ b/docs/symbols/Roo.Component.json
@@ -20,7 +20,7 @@
     "Roo.bootstrap.nav.Simplebar" : [
       "Roo.bootstrap.PagingToolbar",
       "Roo.bootstrap.PopoverNav",
-      "Roo.bootstrap.form.HtmlEditorToolbarStandard",
+      "Roo.bootstrap.form.HtmlEditorToolbar.Standard",
       "Roo.bootstrap.nav.Headerbar"
     ],
     "Roo.bootstrap.Button" : [
@@ -178,6 +178,7 @@
       "Roo.bootstrap.form.DateField",
       "Roo.bootstrap.form.MonthField",
       "Roo.bootstrap.form.NumberField",
+      "Roo.bootstrap.form.Password",
       "Roo.bootstrap.form.RadioSet",
       "Roo.bootstrap.form.SecurePass",
       "Roo.bootstrap.form.TextArea",
@@ -229,6 +230,14 @@
         "visibility"
       ]
     },
+    {
+      "name" : "style",
+      "type" : "String",
+      "desc" : "css styles to add to component\neg. text-align:right;",
+      "memberOf" : "",
+      "isOptional" : false,
+      "optvals" : []
+    },
     {
       "name" : "allowDomMove",
       "type" : "Boolean",